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

[Steve Dickson]

commit b94acc9a88ea99afb599983bc5e303446d79e7c3
Merge: 74c6ce2 d3cee57
Author: Steve Dickson <steved at redhat.com>
Date:   Mon Oct 4 15:37:58 2010 -0400

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

---