Merge branch 'master' into next
authorDavid ‘Bombe’ Roden <bombe@pterodactylus.net>
Mon, 8 Oct 2012 12:32:50 +0000 (14:32 +0200)
committerDavid ‘Bombe’ Roden <bombe@pterodactylus.net>
Mon, 8 Oct 2012 12:32:50 +0000 (14:32 +0200)

Trivial merge