Merge remote branch 'origin/master'
authorirengrig <Irina.Chernushina@jetbrains.com>
Wed, 1 Feb 2012 14:40:33 +0000 (18:40 +0400)
committerirengrig <Irina.Chernushina@jetbrains.com>
Wed, 1 Feb 2012 14:40:33 +0000 (18:40 +0400)

Trivial merge