Merge branch 'release-0.5.2' 0.5.2
authorDavid ‘Bombe’ Roden <bombe@pterodactylus.net>
Tue, 29 Mar 2011 18:24:36 +0000 (20:24 +0200)
committerDavid ‘Bombe’ Roden <bombe@pterodactylus.net>
Tue, 29 Mar 2011 18:24:36 +0000 (20:24 +0200)

Trivial merge