Merge branch 'master' of git.labs.intellij.net:idea/community
authorYann Cebron <yann.cebron@googlemail.com>
Tue, 21 Dec 2010 18:15:49 +0000 (19:15 +0100)
committerYann Cebron <yann.cebron@googlemail.com>
Tue, 21 Dec 2010 18:15:49 +0000 (19:15 +0100)

Trivial merge