Merge branch 'master' of git.labs.intellij.net:idea/community into groovyfolding
authorpeter <peter.gromov@jetbrains.com>
Thu, 4 Mar 2010 15:15:03 +0000 (15:15 +0000)
committerpeter <peter.gromov@jetbrains.com>
Thu, 4 Mar 2010 15:15:03 +0000 (15:15 +0000)

Trivial merge