Merge remote-tracking branch 'origin/master'
authorAnna Kozlova <anna.kozlova@jetbrains.com>
Wed, 25 Jan 2012 12:54:45 +0000 (16:54 +0400)
committerAnna Kozlova <anna.kozlova@jetbrains.com>
Wed, 25 Jan 2012 12:54:45 +0000 (16:54 +0400)

Trivial merge