[cifs-utils/f17: 9/9] Merge branch 'master' into f17

[Dennis Gilmore]

commit 7867a77d7086d2907051f2c942d8d9c1e4acbe2d
Merge: 8882cb4 4d5468e
Author: Dennis Gilmore <dennis at ausil.us>
Date:   Fri May 11 08:20:04 2012 -0500

    Merge branch 'master' into f17
    
    Conflicts:
    	cifs-utils.spec

 cifs-utils.spec |    5 ++++-
 1 files changed, 4 insertions(+), 1 deletions(-)
---