Merge branch 'master' into changeSignature
authorMaxim Medvedev <maxim.medvedev@jetbrains.com>
Mon, 15 Mar 2010 12:15:21 +0000 (15:15 +0300)
committerMaxim Medvedev <maxim.medvedev@jetbrains.com>
Mon, 15 Mar 2010 12:15:21 +0000 (15:15 +0300)

Trivial merge