Auto-update from upstream
authorKyle McMartin <kyle@parisc-linux.org>
Fri, 28 Oct 2005 16:18:07 +0000 (12:18 -0400)
committerKyle McMartin <kyle@parisc-linux.org>
Fri, 28 Oct 2005 16:18:07 +0000 (12:18 -0400)

Trivial merge