Merge ../linus/
authorDave Jones <davej@redhat.com>
Wed, 7 Dec 2005 03:14:09 +0000 (19:14 -0800)
committerDave Jones <davej@redhat.com>
Wed, 7 Dec 2005 03:14:09 +0000 (19:14 -0800)

Trivial merge