Merge branch 'release-0.3.7' 0.3.7
authorDavid ‘Bombe’ Roden <bombe@pterodactylus.net>
Thu, 13 Jan 2011 20:31:48 +0000 (21:31 +0100)
committerDavid ‘Bombe’ Roden <bombe@pterodactylus.net>
Thu, 13 Jan 2011 20:31:48 +0000 (21:31 +0100)

Trivial merge