Merge remote-tracking branch 'origin/master'
authoranna <Anna.Kozlova@jetbrains.com>
Wed, 20 Feb 2013 15:35:26 +0000 (16:35 +0100)
committeranna <Anna.Kozlova@jetbrains.com>
Wed, 20 Feb 2013 15:35:26 +0000 (16:35 +0100)

Trivial merge