Merge branch 'master' into next
authorDavid ‘Bombe’ Roden <bombe@pterodactylus.net>
Thu, 28 Oct 2010 18:20:14 +0000 (20:20 +0200)
committerDavid ‘Bombe’ Roden <bombe@pterodactylus.net>
Thu, 28 Oct 2010 18:20:14 +0000 (20:20 +0200)

Trivial merge