Merge branch 'master' into next
authorDavid ‘Bombe’ Roden <bombe@pterodactylus.net>
Sat, 17 Sep 2011 12:58:15 +0000 (14:58 +0200)
committerDavid ‘Bombe’ Roden <bombe@pterodactylus.net>
Sat, 17 Sep 2011 12:58:15 +0000 (14:58 +0200)

Trivial merge