Merge branch 'master' into next
authorDavid ‘Bombe’ Roden <bombe@pterodactylus.net>
Fri, 16 Sep 2011 11:09:43 +0000 (13:09 +0200)
committerDavid ‘Bombe’ Roden <bombe@pterodactylus.net>
Fri, 16 Sep 2011 11:09:43 +0000 (13:09 +0200)

Trivial merge