Merge remote-tracking branch 'origin/master'
authorAnna Kozlova <anna.kozlova@jetbrains.com>
Tue, 24 Jan 2012 16:44:07 +0000 (20:44 +0400)
committerAnna Kozlova <anna.kozlova@jetbrains.com>
Tue, 24 Jan 2012 16:44:07 +0000 (20:44 +0400)

Trivial merge