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

Trivial merge