Merge branch 'master' of git.labs.intellij.net:idea/community
authorKonstantin Bulenkov <kb@jetbrains.com>
Mon, 5 Jul 2010 09:52:43 +0000 (13:52 +0400)
committerKonstantin Bulenkov <kb@jetbrains.com>
Mon, 5 Jul 2010 09:52:43 +0000 (13:52 +0400)

Trivial merge