Merge fix for 121
authorKirill Likhodedov <Kirill.Likhodedov@jetbrains.com>
Sun, 12 Aug 2012 11:29:28 +0000 (15:29 +0400)
committerKirill Likhodedov <Kirill.Likhodedov@jetbrains.com>
Sun, 12 Aug 2012 11:29:28 +0000 (15:29 +0400)

Trivial merge