Merge branch 'linus_origin' into hotfixes
authorTrond Myklebust <Trond.Myklebust@netapp.com>
Fri, 15 Feb 2008 18:36:30 +0000 (13:36 -0500)
committerTrond Myklebust <Trond.Myklebust@netapp.com>
Fri, 15 Feb 2008 18:36:30 +0000 (13:36 -0500)

Trivial merge