Merge remote-tracking branch 'origin/master'
authorAlexander Lobas <Alexander.Lobas@jetbrains.com>
Mon, 23 Jan 2012 16:12:02 +0000 (20:12 +0400)
committerAlexander Lobas <Alexander.Lobas@jetbrains.com>
Mon, 23 Jan 2012 16:12:02 +0000 (20:12 +0400)

Trivial merge