[nfs-utils/rawhide/user/steved/pnfs-rawhide: 6/6] Merge branch 'rawhide/user/steved/pnfs-rawhide' of ssh://pkgs.fedoraproject.org/nfs-utils into pnfs-

[Steve Dickson]

commit 738d63df2acbf9365c6bb8d9ea2ae6e5b0a9daf2
Merge: 55fb4e9 5522ca1
Author: Steve Dickson <steved at redhat.com>
Date:   Mon Oct 4 15:42:01 2010 -0400

    Merge branch 'rawhide/user/steved/pnfs-rawhide' of ssh://pkgs.fedoraproject.org/nfs-utils into pnfs-rawhide
    
    Conflicts:
    	nfs-utils.spec
    
    Signed-off-by: Steve Dickson <steved at redhat.com>

---