Merge branch 'release-0.6.7' 0.6.7
authorDavid ‘Bombe’ Roden <bombe@pterodactylus.net>
Mon, 12 Sep 2011 13:04:50 +0000 (15:04 +0200)
committerDavid ‘Bombe’ Roden <bombe@pterodactylus.net>
Mon, 12 Sep 2011 13:04:50 +0000 (15:04 +0200)

Trivial merge