Merge branch 'master' of git.labs.intellij.net:idea/community
authorYann Cébron <yann@yc.local>
Sat, 31 Jul 2010 12:50:05 +0000 (14:50 +0200)
committerYann Cébron <yann@yc.local>
Sat, 31 Jul 2010 12:50:05 +0000 (14:50 +0200)

Trivial merge