Merge remote-tracking branch 'origin/master'
authorAnna Kozlova <anna.kozlova@jetbrains.com>
Thu, 26 Jan 2012 18:09:00 +0000 (22:09 +0400)
committerAnna Kozlova <anna.kozlova@jetbrains.com>
Thu, 26 Jan 2012 18:09:00 +0000 (22:09 +0400)

Trivial merge