Merge branch 'master' of git@git.labs.intellij.net:idea/community
authorKirill Kalishev <kirill.kalishev@jetbrains.com>
Mon, 17 Jan 2011 13:21:15 +0000 (16:21 +0300)
committerKirill Kalishev <kirill.kalishev@jetbrains.com>
Mon, 17 Jan 2011 13:21:15 +0000 (16:21 +0300)

Trivial merge