Merge remote-tracking branch 'origin/master'
authorAnna Kozlova <anna.kozlova@jetbrains.com>
Mon, 30 Jan 2012 14:35:21 +0000 (18:35 +0400)
committerAnna Kozlova <anna.kozlova@jetbrains.com>
Mon, 30 Jan 2012 14:35:21 +0000 (18:35 +0400)

Trivial merge