Merge branch 'master' of git.labs.intellij.net:idea/community
authorYann Cébron <yann@yc.local>
Tue, 22 Jun 2010 15:54:56 +0000 (17:54 +0200)
committerYann Cébron <yann@yc.local>
Tue, 22 Jun 2010 15:54:56 +0000 (17:54 +0200)

Trivial merge