Merge fix for 121
authorKirill Likhodedov <Kirill.Likhodedov@jetbrains.com>
Fri, 24 Aug 2012 12:30:07 +0000 (16:30 +0400)
committerKirill Likhodedov <Kirill.Likhodedov@jetbrains.com>
Fri, 24 Aug 2012 12:30:07 +0000 (16:30 +0400)

Trivial merge