Merge branch 'master' of git.labs.intellij.net:idea/community
authorYann Cebron <yann.cebron@googlemail.com>
Thu, 16 Sep 2010 20:20:58 +0000 (22:20 +0200)
committerYann Cebron <yann.cebron@googlemail.com>
Thu, 16 Sep 2010 20:20:58 +0000 (22:20 +0200)

Trivial merge