Merge branch 'release-0.3.6.4' 0.3.6.4
authorDavid ‘Bombe’ Roden <bombe@pterodactylus.net>
Thu, 6 Jan 2011 13:42:06 +0000 (14:42 +0100)
committerDavid ‘Bombe’ Roden <bombe@pterodactylus.net>
Thu, 6 Jan 2011 13:42:06 +0000 (14:42 +0100)

Trivial merge