Merge branch 'master' into upsource-master
authorEvgeny Pasynkov <Evgeny.Pasynkov@jetbrains.com>
Wed, 25 Jul 2012 10:15:47 +0000 (12:15 +0200)
committerEvgeny Pasynkov <Evgeny.Pasynkov@jetbrains.com>
Wed, 25 Jul 2012 10:15:47 +0000 (12:15 +0200)

Trivial merge