Merge remote-tracking branch 'origin/master'
authorAlexander Lobas <Alexander.Lobas@jetbrains.com>
Mon, 30 Jan 2012 13:55:45 +0000 (17:55 +0400)
committerAlexander Lobas <Alexander.Lobas@jetbrains.com>
Mon, 30 Jan 2012 13:55:45 +0000 (17:55 +0400)

Trivial merge