Merge branch 'master' of git.labs.intellij.net:idea/community
authorYann Cebron <yann.cebron@googlemail.com>
Fri, 10 Sep 2010 16:33:36 +0000 (18:33 +0200)
committerYann Cebron <yann.cebron@googlemail.com>
Fri, 10 Sep 2010 16:33:36 +0000 (18:33 +0200)

Trivial merge