Merge remote-tracking branch 'origin/master'
authorAlexander Lobas <Alexander.Lobas@jetbrains.com>
Mon, 23 Apr 2012 17:48:29 +0000 (21:48 +0400)
committerAlexander Lobas <Alexander.Lobas@jetbrains.com>
Mon, 23 Apr 2012 17:48:29 +0000 (21:48 +0400)

Trivial merge