Merge branch 'release-0.6.3' 0.6.3
authorDavid ‘Bombe’ Roden <bombe@pterodactylus.net>
Thu, 28 Apr 2011 19:38:55 +0000 (21:38 +0200)
committerDavid ‘Bombe’ Roden <bombe@pterodactylus.net>
Thu, 28 Apr 2011 19:38:55 +0000 (21:38 +0200)

Trivial merge