Merge remote branch 'origin/master'
authorKirill Kalishev <kirill.kalishev@jetbrains.com>
Mon, 10 Oct 2011 14:48:51 +0000 (18:48 +0400)
committerKirill Kalishev <kirill.kalishev@jetbrains.com>
Mon, 10 Oct 2011 14:48:51 +0000 (18:48 +0400)

Trivial merge