Merge remote-tracking branch 'origin/master'
authorMaxim.Medvedev <maxim.medvedev@jetbrains.com>
Tue, 31 Jan 2012 13:26:52 +0000 (17:26 +0400)
committerMaxim.Medvedev <maxim.medvedev@jetbrains.com>
Tue, 31 Jan 2012 13:26:52 +0000 (17:26 +0400)

Trivial merge