Merge remote-tracking branch 'origin/master'
authorKirill Likhodedov <Kirill.Likhodedov@gmail.com>
Mon, 23 Jan 2012 15:51:54 +0000 (19:51 +0400)
committerKirill Likhodedov <Kirill.Likhodedov@gmail.com>
Mon, 23 Jan 2012 15:51:54 +0000 (19:51 +0400)

Trivial merge