Merge remote-tracking branch 'origin/master'
authorAlexander Lobas <Alexander.Lobas@jetbrains.com>
Tue, 24 Jan 2012 14:30:58 +0000 (18:30 +0400)
committerAlexander Lobas <Alexander.Lobas@jetbrains.com>
Tue, 24 Jan 2012 14:30:58 +0000 (18:30 +0400)

Trivial merge