Merge remote-tracking branch 'origin/master'
authorKirill Likhodedov <Kirill.Likhodedov@jetbrains.com>
Mon, 30 Jan 2012 12:10:57 +0000 (16:10 +0400)
committerKirill Likhodedov <Kirill.Likhodedov@jetbrains.com>
Mon, 30 Jan 2012 12:10:57 +0000 (16:10 +0400)

Trivial merge