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

Trivial merge