Merge branch 'master' of git.labs.intellij.net:idea/community
authorYann Cébron <yann@yc.local>
Thu, 22 Jul 2010 20:04:44 +0000 (22:04 +0200)
committerYann Cébron <yann@yc.local>
Thu, 22 Jul 2010 20:04:44 +0000 (22:04 +0200)

Trivial merge