Merge branch 'master' into changeSignature
authorMaxim Medvedev <maxim.medvedev@jetbrains.com>
Thu, 11 Mar 2010 10:54:03 +0000 (13:54 +0300)
committerMaxim Medvedev <maxim.medvedev@jetbrains.com>
Thu, 11 Mar 2010 10:54:03 +0000 (13:54 +0300)

Trivial merge