Merge branch 'upstream'
authorMark A. Hershberger <mah@debian.(none)>
Wed, 25 Mar 2009 04:37:51 +0000 (00:37 -0400)
committerMark A. Hershberger <mah@debian.(none)>
Wed, 25 Mar 2009 04:37:51 +0000 (00:37 -0400)

Trivial merge