Merge branch 'release-0.6.5' 0.6.5
authorDavid ‘Bombe’ Roden <bombe@pterodactylus.net>
Sun, 19 Jun 2011 14:27:08 +0000 (16:27 +0200)
committerDavid ‘Bombe’ Roden <bombe@pterodactylus.net>
Sun, 19 Jun 2011 14:27:08 +0000 (16:27 +0200)

Trivial merge