Merge remote branch 'origin/master'
authorDmitry Trofimov <dmitry.trofimov@jetbrains.com>
Fri, 23 Sep 2011 10:29:37 +0000 (14:29 +0400)
committerDmitry Trofimov <dmitry.trofimov@jetbrains.com>
Fri, 23 Sep 2011 10:29:37 +0000 (14:29 +0400)

Trivial merge