Merge branch 'remotes/merge-requests/21' (early part)
authorChristopher Allan Webber <cwebber@dustycloud.org>
Mon, 5 Sep 2011 18:53:30 +0000 (13:53 -0500)
committerChristopher Allan Webber <cwebber@dustycloud.org>
Mon, 5 Sep 2011 18:53:30 +0000 (13:53 -0500)

Trivial merge