Merge branch 'master'
authorKyle McMartin <kyle@parisc-linux.org>
Fri, 18 Nov 2005 21:39:20 +0000 (16:39 -0500)
committerKyle McMartin <kyle@parisc-linux.org>
Fri, 18 Nov 2005 21:39:20 +0000 (16:39 -0500)

Trivial merge