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

Trivial merge