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

Trivial merge