Merge branch 'upstream'
authorBdale Garbee <bdale@gag.com>
Mon, 10 Aug 2009 18:09:51 +0000 (12:09 -0600)
committerBdale Garbee <bdale@gag.com>
Mon, 10 Aug 2009 18:09:51 +0000 (12:09 -0600)

Trivial merge