Merge branch 'release-0.6.6' 0.6.6
authorDavid ‘Bombe’ Roden <bombe@pterodactylus.net>
Mon, 12 Sep 2011 11:40:37 +0000 (13:40 +0200)
committerDavid ‘Bombe’ Roden <bombe@pterodactylus.net>
Mon, 12 Sep 2011 11:40:37 +0000 (13:40 +0200)

Trivial merge