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

Trivial merge