Merge commit '0b45c3af0d7947a3b38aeffea3e0eeac4f59d46a' into upstream
authorBdale Garbee <bdale@gag.com>
Tue, 23 Mar 2010 01:43:02 +0000 (19:43 -0600)
committerBdale Garbee <bdale@gag.com>
Tue, 23 Mar 2010 01:43:02 +0000 (19:43 -0600)

Trivial merge