Merge branch 'master' into changeSignature
authorMaxim Medvedev <maxim.medvedev@jetbrains.com>
Sat, 3 Apr 2010 10:24:50 +0000 (14:24 +0400)
committerMaxim Medvedev <maxim.medvedev@jetbrains.com>
Sat, 3 Apr 2010 10:24:50 +0000 (14:24 +0400)

Trivial merge