Merge branch 'bookmarks' into next. This fixes #103.
authorDavid ‘Bombe’ Roden <bombe@pterodactylus.net>
Thu, 17 Feb 2011 10:30:19 +0000 (11:30 +0100)
committerDavid ‘Bombe’ Roden <bombe@pterodactylus.net>
Thu, 17 Feb 2011 10:30:19 +0000 (11:30 +0100)

Trivial merge