Merge branch 'release-0.3.4' 0.3.4
authorDavid ‘Bombe’ Roden <bombe@pterodactylus.net>
Sun, 12 Dec 2010 16:25:23 +0000 (17:25 +0100)
committerDavid ‘Bombe’ Roden <bombe@pterodactylus.net>
Sun, 12 Dec 2010 16:25:23 +0000 (17:25 +0100)

Trivial merge