Merge branch 'bugfixes' into nfs-for-next
authorTrond Myklebust <Trond.Myklebust@netapp.com>
Thu, 3 Dec 2009 21:01:51 +0000 (16:01 -0500)
committerTrond Myklebust <Trond.Myklebust@netapp.com>
Thu, 3 Dec 2009 21:01:51 +0000 (16:01 -0500)

Trivial merge