Merge branch 'bugfixes' into nfs-for-next

This commit is contained in:
Trond Myklebust 2009-12-08 14:36:53 -05:00
commit e4ee5d4dfd