Merge remote-tracking branch 'origin/master'
authorKirill Likhodedov <Kirill.Likhodedov@jetbrains.com>
Sat, 28 Jan 2012 14:35:34 +0000 (18:35 +0400)
committerKirill Likhodedov <Kirill.Likhodedov@jetbrains.com>
Sat, 28 Jan 2012 14:35:34 +0000 (18:35 +0400)

Trivial merge