Merge remote-tracking branch 'refs/remotes/rodney757/issue643' into mergetest
authorChristopher Allan Webber <cwebber@dustycloud.org>
Fri, 26 Apr 2013 16:12:46 +0000 (11:12 -0500)
committerChristopher Allan Webber <cwebber@dustycloud.org>
Fri, 26 Apr 2013 16:12:46 +0000 (11:12 -0500)

Trivial merge