Merge remote branch 'origin/master'
authorDmitry Trofimov <dmitry.trofimov@jetbrains.com>
Fri, 2 Sep 2011 17:37:30 +0000 (21:37 +0400)
committerDmitry Trofimov <dmitry.trofimov@jetbrains.com>
Fri, 2 Sep 2011 17:37:30 +0000 (21:37 +0400)

Trivial merge