Merge branch 'master' of git.labs.intellij.net:idea/community
authorMaxim Medvedev <maxim.medvedev@jetbrains.com>
Tue, 26 Jan 2010 16:00:22 +0000 (19:00 +0300)
committerMaxim Medvedev <maxim.medvedev@jetbrains.com>
Tue, 26 Jan 2010 16:00:22 +0000 (19:00 +0300)

Trivial merge