Merge branch 'master' of git.labs.intellij.net:idea/community
authorpeter <peter.gromov@jetbrains.com>
Fri, 30 Apr 2010 20:24:10 +0000 (21:24 +0100)
committerpeter <peter.gromov@jetbrains.com>
Fri, 30 Apr 2010 20:24:10 +0000 (21:24 +0100)

Trivial merge