Merge remote branch 'origin/master'
authorKirill Likhodedov <kirill.likhodedov@jetbrains.com>
Mon, 4 Apr 2011 13:21:28 +0000 (17:21 +0400)
committerKirill Likhodedov <kirill.likhodedov@jetbrains.com>
Mon, 4 Apr 2011 13:21:28 +0000 (17:21 +0400)

Trivial merge