Merge branch 'master' into changeSignature
authorMaxim Medvedev <maxim.medvedev@jetbrains.com>
Tue, 16 Mar 2010 14:21:59 +0000 (17:21 +0300)
committerMaxim Medvedev <maxim.medvedev@jetbrains.com>
Tue, 16 Mar 2010 14:21:59 +0000 (17:21 +0300)

Trivial merge