merge
authorIan Campbell <ijc@hellion.org.uk>
Sun, 13 Jan 2013 10:20:52 +0000 (10:20 +0000)
committerIan Campbell <ijc@hellion.org.uk>
Sun, 13 Jan 2013 10:20:52 +0000 (10:20 +0000)

Trivial merge