Merge remote branch 'origin/master'
authorKirill Kalishev <kirill.kalishev@jetbrains.com>
Mon, 19 Sep 2011 04:08:55 +0000 (08:08 +0400)
committerKirill Kalishev <kirill.kalishev@jetbrains.com>
Mon, 19 Sep 2011 04:08:55 +0000 (08:08 +0400)

Trivial merge