Merge branch 'master' of git.labs.intellij.net:idea/community
authorKirill.Safonov <kirill.safonov@swiftteams.com>
Fri, 15 Jan 2010 15:04:55 +0000 (18:04 +0300)
committerKirill.Safonov <kirill.safonov@swiftteams.com>
Fri, 15 Jan 2010 15:04:55 +0000 (18:04 +0300)

Trivial merge