Merge branch 'release-0.6.1' 0.6.1
authorDavid ‘Bombe’ Roden <bombe@pterodactylus.net>
Sun, 10 Apr 2011 19:06:23 +0000 (21:06 +0200)
committerDavid ‘Bombe’ Roden <bombe@pterodactylus.net>
Sun, 10 Apr 2011 19:06:23 +0000 (21:06 +0200)

Trivial merge