Merge remote-tracking branch 'origin/master'
authorKirill Likhodedov <Kirill.Likhodedov@jetbrains.com>
Tue, 31 Jan 2012 12:22:01 +0000 (16:22 +0400)
committerKirill Likhodedov <Kirill.Likhodedov@jetbrains.com>
Tue, 31 Jan 2012 12:22:01 +0000 (16:22 +0400)

Trivial merge