Merge commit 'origin/master'
authorMaxim Medvedev <maxim.medvedev@jetbrains.com>
Wed, 24 Nov 2010 07:49:38 +0000 (10:49 +0300)
committerMaxim Medvedev <maxim.medvedev@jetbrains.com>
Wed, 24 Nov 2010 07:49:38 +0000 (10:49 +0300)

Trivial merge