Merge branch 'master' of git.labs.intellij.net:idea/community
authorirengrig <Irina.Chernushina@jetbrains.com>
Fri, 14 May 2010 15:47:41 +0000 (19:47 +0400)
committerirengrig <Irina.Chernushina@jetbrains.com>
Fri, 14 May 2010 15:47:41 +0000 (19:47 +0400)

Trivial merge