Merge branch 'master' of git@git.labs.intellij.net:idea/community
authorKirill Kalishev <kirillk@kirillk-ubuntu10.(none)>
Thu, 3 Dec 2009 20:01:04 +0000 (23:01 +0300)
committerKirill Kalishev <kirillk@kirillk-ubuntu10.(none)>
Thu, 3 Dec 2009 20:01:04 +0000 (23:01 +0300)

Trivial merge