Merge branch 'master' of git@git.labs.intellij.net:idea/community
authorRoman Shevchenko <roman.shevchenko@jetbrains.com>
Mon, 22 Mar 2010 10:01:28 +0000 (13:01 +0300)
committerRoman Shevchenko <roman.shevchenko@jetbrains.com>
Mon, 22 Mar 2010 10:01:28 +0000 (13:01 +0300)

Trivial merge