Merge branch 'master' of git.labs.intellij.net:idea/community
authorEkaterina Tuzova <Ekaterina.Tuzova@jetbrains.com>
Thu, 2 Dec 2010 11:26:11 +0000 (14:26 +0300)
committerEkaterina Tuzova <Ekaterina.Tuzova@jetbrains.com>
Thu, 2 Dec 2010 11:26:11 +0000 (14:26 +0300)

Trivial merge