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

Trivial merge