Merge branch 'master' into branch-1.0
authorBdale Garbee <bdale@gag.com>
Tue, 27 Sep 2011 07:00:14 +0000 (01:00 -0600)
committerBdale Garbee <bdale@gag.com>
Tue, 27 Sep 2011 07:00:14 +0000 (01:00 -0600)

Trivial merge