Merge fix for 121
authorKirill Likhodedov <Kirill.Likhodedov@jetbrains.com>
Sat, 11 Aug 2012 13:36:15 +0000 (17:36 +0400)
committerKirill Likhodedov <Kirill.Likhodedov@jetbrains.com>
Sat, 11 Aug 2012 13:36:15 +0000 (17:36 +0400)

Trivial merge