Merge commit 'remotes/origin/master'
authorMaxim Medvedev <maxim.medvedev@jetbrains.com>
Fri, 10 Sep 2010 12:18:16 +0000 (16:18 +0400)
committerMaxim Medvedev <maxim.medvedev@jetbrains.com>
Fri, 10 Sep 2010 12:18:16 +0000 (16:18 +0400)

Trivial merge