Merge commit 'origin/master'
authorMaxim Medvedev <maxim.medvedev@jetbrains.com>
Fri, 17 Sep 2010 08:45:55 +0000 (12:45 +0400)
committerMaxim Medvedev <maxim.medvedev@jetbrains.com>
Fri, 17 Sep 2010 08:45:55 +0000 (12:45 +0400)

Trivial merge