Merge branch 'release-0.6' 0.6
authorDavid ‘Bombe’ Roden <bombe@pterodactylus.net>
Sat, 2 Apr 2011 22:14:03 +0000 (00:14 +0200)
committerDavid ‘Bombe’ Roden <bombe@pterodactylus.net>
Sat, 2 Apr 2011 22:14:03 +0000 (00:14 +0200)

Trivial merge