Merge commit 'origin/master' into changeSignature
authorMaxim Medvedev <maxim.medvedev@jetbrains.com>
Sun, 23 May 2010 11:23:45 +0000 (15:23 +0400)
committerMaxim Medvedev <maxim.medvedev@jetbrains.com>
Sun, 23 May 2010 11:23:45 +0000 (15:23 +0400)

Trivial merge