Merge remote-tracking branch 'origin/master'
authorAlexander Lobas <Alexander.Lobas@jetbrains.com>
Wed, 1 Feb 2012 16:55:06 +0000 (20:55 +0400)
committerAlexander Lobas <Alexander.Lobas@jetbrains.com>
Wed, 1 Feb 2012 16:55:06 +0000 (20:55 +0400)

Trivial merge