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

Trivial merge