Merge remote branch 'remotes/osamak/master'
authorChristopher Allan Webber <cwebber@dustycloud.org>
Tue, 12 Jul 2011 01:31:45 +0000 (20:31 -0500)
committerChristopher Allan Webber <cwebber@dustycloud.org>
Tue, 12 Jul 2011 01:31:45 +0000 (20:31 -0500)

Trivial merge