Merge remote branch 'origin/master'
authorDmitry Trofimov <dmitry.trofimov@jetbrains.com>
Fri, 5 Aug 2011 13:20:22 +0000 (17:20 +0400)
committerDmitry Trofimov <dmitry.trofimov@jetbrains.com>
Fri, 5 Aug 2011 13:20:22 +0000 (17:20 +0400)

Trivial merge