Merge branch 'master' of git.labs.intellij.net:idea/community
authorMaxim Medvedev <maxim.medvedev@jetbrains.com>
Wed, 4 Aug 2010 12:57:30 +0000 (16:57 +0400)
committerMaxim Medvedev <maxim.medvedev@jetbrains.com>
Wed, 4 Aug 2010 12:57:30 +0000 (16:57 +0400)

Trivial merge