Merge branch 'master' of git.labs.intellij.net:idea/community
authorEkaterina Tuzova <Ekaterina.Tuzova@jetbrains.com>
Wed, 1 Dec 2010 17:26:03 +0000 (20:26 +0300)
committerEkaterina Tuzova <Ekaterina.Tuzova@jetbrains.com>
Wed, 1 Dec 2010 17:26:03 +0000 (20:26 +0300)

Trivial merge