Merge remote-tracking branch 'origin/master'
authorMaxim.Medvedev <maxim.medvedev@jetbrains.com>
Wed, 1 Feb 2012 12:58:51 +0000 (16:58 +0400)
committerMaxim.Medvedev <maxim.medvedev@jetbrains.com>
Wed, 1 Feb 2012 12:58:51 +0000 (16:58 +0400)

Trivial merge