Merge remote-tracking branch 'upstream/master'
authorEd Loach <ed@loach.me.uk>
Thu, 25 Oct 2012 13:05:36 +0000 (14:05 +0100)
committerEd Loach <ed@loach.me.uk>
Thu, 25 Oct 2012 13:05:36 +0000 (14:05 +0100)

Trivial merge