Merge remote-tracking branch 'origin/master'
authorDmitry Trofimov <dmitry.trofimov@jetbrains.com>
Thu, 24 Nov 2011 10:54:40 +0000 (11:54 +0100)
committerDmitry Trofimov <dmitry.trofimov@jetbrains.com>
Thu, 24 Nov 2011 10:54:40 +0000 (11:54 +0100)

Trivial merge