Merge branch 'master' into multiroot_branch
authorKirill Likhodedov <Kirill.Likhodedov@gmail.com>
Fri, 20 Jan 2012 11:27:42 +0000 (14:27 +0300)
committerKirill Likhodedov <Kirill.Likhodedov@gmail.com>
Fri, 20 Jan 2012 11:27:42 +0000 (14:27 +0300)

Trivial merge