Merge remote-tracking branch 'origin/master'
authorAnna Kozlova <anna.kozlova@jetbrains.com>
Thu, 2 Feb 2012 07:27:18 +0000 (11:27 +0400)
committerAnna Kozlova <anna.kozlova@jetbrains.com>
Thu, 2 Feb 2012 07:27:18 +0000 (11:27 +0400)

Trivial merge