Merge remote-tracking branch 'origin/master'
authorDmitry Trofimov <dmitry.trofimov@jetbrains.com>
Mon, 12 Dec 2011 18:47:06 +0000 (19:47 +0100)
committerDmitry Trofimov <dmitry.trofimov@jetbrains.com>
Mon, 12 Dec 2011 18:47:06 +0000 (19:47 +0100)

Trivial merge