Merge branch 'release-0.6.4' 0.6.4
authorDavid ‘Bombe’ Roden <bombe@pterodactylus.net>
Sun, 8 May 2011 18:13:20 +0000 (20:13 +0200)
committerDavid ‘Bombe’ Roden <bombe@pterodactylus.net>
Sun, 8 May 2011 18:13:20 +0000 (20:13 +0200)

Trivial merge