Merge branch 'master' of git.labs.intellij.net:idea/community
authorYann Cébron <yann@yc.local>
Sat, 23 Jan 2010 12:29:24 +0000 (13:29 +0100)
committerYann Cébron <yann@yc.local>
Sat, 23 Jan 2010 12:29:24 +0000 (13:29 +0100)

Trivial merge