Merged
authorTim Golden <mail@timgolden.me.uk>
Fri, 29 Jun 2012 21:11:38 +0000 (22:11 +0100)
committerTim Golden <mail@timgolden.me.uk>
Fri, 29 Jun 2012 21:11:38 +0000 (22:11 +0100)

Trivial merge