Merge remote-tracking branch 'refs/remotes/rodney757/misc'
authorChristopher Allan Webber <cwebber@dustycloud.org>
Wed, 10 Jul 2013 22:50:14 +0000 (17:50 -0500)
committerChristopher Allan Webber <cwebber@dustycloud.org>
Wed, 10 Jul 2013 22:50:14 +0000 (17:50 -0500)

Trivial merge