Merge branch 'release-0.3.6' 0.3.6
authorDavid ‘Bombe’ Roden <bombe@pterodactylus.net>
Thu, 30 Dec 2010 21:25:23 +0000 (22:25 +0100)
committerDavid ‘Bombe’ Roden <bombe@pterodactylus.net>
Thu, 30 Dec 2010 21:25:23 +0000 (22:25 +0100)

Trivial merge