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

[Steve Dickson]

commit 24b44f9653d531e428033a168d24ba23841f6d56
Merge: 0e14acb 7c969bd
Author: Steve Dickson <steved at redhat.com>
Date:   Fri Jan 28 14:50:23 2011 -0500

    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>

---