Merge remote-tracking branch 'origin/master'
authoranna <Anna.Kozlova@jetbrains.com>
Mon, 16 Jan 2012 19:13:07 +0000 (20:13 +0100)
committeranna <Anna.Kozlova@jetbrains.com>
Mon, 16 Jan 2012 19:13:07 +0000 (20:13 +0100)

Trivial merge