Auto-update from upstream
authorKyle McMartin <kyle@parisc-linux.org>
Thu, 27 Oct 2005 03:28:40 +0000 (23:28 -0400)
committerKyle McMartin <kyle@parisc-linux.org>
Thu, 27 Oct 2005 03:28:40 +0000 (23:28 -0400)

Trivial merge