Merge branch 'master' of git.labs.intellij.net:idea/community
authorDmitry Boulytchev (dboulytchev@gmail.com) <gjhjctyjr>
Wed, 1 Feb 2012 21:24:44 +0000 (01:24 +0400)
committerDmitry Boulytchev (dboulytchev@gmail.com) <gjhjctyjr>
Wed, 1 Feb 2012 21:24:44 +0000 (01:24 +0400)

Trivial merge