Merge remote-tracking branch 'origin/master'
authorDmitry Trofimov <dmitry.trofimov@jetbrains.com>
Thu, 17 Nov 2011 15:35:23 +0000 (16:35 +0100)
committerDmitry Trofimov <dmitry.trofimov@jetbrains.com>
Thu, 17 Nov 2011 15:35:23 +0000 (16:35 +0100)

Trivial merge