Merge branch 'next' into profile-fields
authorDavid ‘Bombe’ Roden <bombe@pterodactylus.net>
Fri, 14 Jan 2011 07:34:38 +0000 (08:34 +0100)
committerDavid ‘Bombe’ Roden <bombe@pterodactylus.net>
Fri, 14 Jan 2011 07:34:38 +0000 (08:34 +0100)

Trivial merge