Merging github/master to merge the pull request occasionally accepted by me directly...
authorKirill Likhodedov <Kirill.Likhodedov@gmail.com>
Mon, 6 Aug 2012 18:16:41 +0000 (22:16 +0400)
committerKirill Likhodedov <Kirill.Likhodedov@gmail.com>
Mon, 6 Aug 2012 18:16:41 +0000 (22:16 +0400)

Trivial merge