Merge remote branch 'remotes/gullydwarf-cfdv/b434_prev_next_use_slug'
authorChristopher Allan Webber <cwebber@dustycloud.org>
Thu, 7 Jul 2011 03:33:37 +0000 (22:33 -0500)
committerChristopher Allan Webber <cwebber@dustycloud.org>
Thu, 7 Jul 2011 03:33:37 +0000 (22:33 -0500)

Trivial merge