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

Trivial merge