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)
commit19553431164b7475cadd0b59411ef41c44e5f0dd
tree389e48ff0a5622530343dfbcbb8917346084fcf3
parent1c56f1dd8d3d5b137cb55027a2a2c8c116ffd5f8
parentebb6ae852762c46344a7f082857035397b4b9eec
Merge fix for 121