Merge branch 'master' into next
authorDavid ‘Bombe’ Roden <bombe@pterodactylus.net>
Mon, 12 Sep 2011 11:40:56 +0000 (13:40 +0200)
committerDavid ‘Bombe’ Roden <bombe@pterodactylus.net>
Mon, 12 Sep 2011 11:40:56 +0000 (13:40 +0200)

Trivial merge