Merge branch 'master' into copyright
authorTom Hughes <tom@compton.nu>
Mon, 19 Apr 2010 20:57:13 +0000 (21:57 +0100)
committerTom Hughes <tom@compton.nu>
Mon, 19 Apr 2010 20:57:13 +0000 (21:57 +0100)

Trivial merge