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

Trivial merge