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

Trivial merge