Merge remote-tracking branch 'origin/master'
authorDmitry Trofimov <dmitry.trofimov@jetbrains.com>
Wed, 1 Feb 2012 15:29:17 +0000 (16:29 +0100)
committerDmitry Trofimov <dmitry.trofimov@jetbrains.com>
Wed, 1 Feb 2012 15:29:17 +0000 (16:29 +0100)

Trivial merge