Merge remote-tracking branch 'origin/master'
authorEkaterina Tuzova <Ekaterina.Tuzova@jetbrains.com>
Wed, 30 May 2012 12:09:12 +0000 (16:09 +0400)
committerEkaterina Tuzova <Ekaterina.Tuzova@jetbrains.com>
Wed, 30 May 2012 12:09:12 +0000 (16:09 +0400)

Trivial merge