Merge branch 'release-0.5.1' 0.5.1
authorDavid ‘Bombe’ Roden <bombe@pterodactylus.net>
Thu, 17 Mar 2011 06:15:28 +0000 (07:15 +0100)
committerDavid ‘Bombe’ Roden <bombe@pterodactylus.net>
Thu, 17 Mar 2011 06:15:28 +0000 (07:15 +0100)

Trivial merge