Merge remote-tracking branch 'refs/remotes/merge-requests/42'
authorChristopher Allan Webber <cwebber@dustycloud.org>
Sun, 19 Aug 2012 17:18:18 +0000 (12:18 -0500)
committerChristopher Allan Webber <cwebber@dustycloud.org>
Sun, 19 Aug 2012 17:18:18 +0000 (12:18 -0500)

Trivial merge