[cciss_vol_status/el6: 8/8] Merge branch 'master' into el6

[Joshua Roys]

commit 580e38e73787b033b209520d91283f9dafea6222
Merge: 60c167f 3ac57f5
Author: Joshua Roys <roysjosh at gmail.com>
Date:   Thu Dec 11 09:58:01 2014 -0500

    Merge branch 'master' into el6
    
    Conflicts:
    	cciss_vol_status.spec
    	sources

 cciss_vol_status.spec |   25 +++++++++++++++++++++++--
 sources               |    2 +-
 2 files changed, 24 insertions(+), 3 deletions(-)
---