Merge remote branch 'remotes/schendjes/master'
authorChristopher Allan Webber <cwebber@dustycloud.org>
Mon, 8 Aug 2011 14:44:00 +0000 (09:44 -0500)
committerChristopher Allan Webber <cwebber@dustycloud.org>
Mon, 8 Aug 2011 14:44:00 +0000 (09:44 -0500)

Trivial merge