Merge commit 'remotes/origin/master'
authorMaxim Medvedev <maxim.medvedev@jetbrains.com>
Sun, 12 Sep 2010 11:26:24 +0000 (15:26 +0400)
committerMaxim Medvedev <maxim.medvedev@jetbrains.com>
Sun, 12 Sep 2010 11:26:24 +0000 (15:26 +0400)

Trivial merge