Merge branch 'release-0.4' 0.4
authorDavid ‘Bombe’ Roden <bombe@pterodactylus.net>
Sat, 15 Jan 2011 22:14:09 +0000 (23:14 +0100)
committerDavid ‘Bombe’ Roden <bombe@pterodactylus.net>
Sat, 15 Jan 2011 22:14:09 +0000 (23:14 +0100)

Trivial merge