Merge remote-tracking branch 'origin/master'
authorAlexander Lobas <Alexander.Lobas@jetbrains.com>
Tue, 31 Jan 2012 08:22:25 +0000 (12:22 +0400)
committerAlexander Lobas <Alexander.Lobas@jetbrains.com>
Tue, 31 Jan 2012 08:22:25 +0000 (12:22 +0400)

Trivial merge