Merge branch 'release-0.3.5' 0.3.5
authorDavid ‘Bombe’ Roden <bombe@pterodactylus.net>
Sat, 18 Dec 2010 01:17:50 +0000 (02:17 +0100)
committerDavid ‘Bombe’ Roden <bombe@pterodactylus.net>
Sat, 18 Dec 2010 01:17:50 +0000 (02:17 +0100)

Trivial merge