Merge branch 'master' into destdir
authorBen Webb <bjwebb67@googlemail.com>
Mon, 11 Jul 2011 12:05:51 +0000 (13:05 +0100)
committerBen Webb <bjwebb67@googlemail.com>
Mon, 11 Jul 2011 12:05:51 +0000 (13:05 +0100)

Trivial merge