Merge branch 'master' of git.labs.intellij.net:idea/community
authorYann Cébron <yann@yc.local>
Fri, 18 Jun 2010 18:52:46 +0000 (20:52 +0200)
committerYann Cébron <yann@yc.local>
Fri, 18 Jun 2010 18:52:46 +0000 (20:52 +0200)

Trivial merge