Merge remote-tracking branch 'refs/remotes/merge-requests/58'
authorChristopher Allan Webber <cwebber@dustycloud.org>
Fri, 17 May 2013 20:08:53 +0000 (15:08 -0500)
committerChristopher Allan Webber <cwebber@dustycloud.org>
Fri, 17 May 2013 20:08:53 +0000 (15:08 -0500)

Trivial merge