Merge remote-tracking branch 'origin/master'
authorMaxim.Medvedev <maxim.medvedev@jetbrains.com>
Fri, 27 Jan 2012 12:19:02 +0000 (16:19 +0400)
committerMaxim.Medvedev <maxim.medvedev@jetbrains.com>
Fri, 27 Jan 2012 12:19:02 +0000 (16:19 +0400)

Trivial merge