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

Trivial merge