Merge branch 'master' of git://linux-nfs.org/nfs-utils
authorSteve Dickson <steved@redhat.com>
Wed, 7 Jan 2009 17:03:07 +0000 (12:03 -0500)
committerSteve Dickson <steved@redhat.com>
Wed, 7 Jan 2009 17:03:07 +0000 (12:03 -0500)

Trivial merge