Merge branch 'master' into next
authorDavid ‘Bombe’ Roden <bombe@pterodactylus.net>
Mon, 5 Mar 2012 05:47:59 +0000 (06:47 +0100)
committerDavid ‘Bombe’ Roden <bombe@pterodactylus.net>
Mon, 5 Mar 2012 05:47:59 +0000 (06:47 +0100)

Trivial merge