[cciss_vol_status/el5: 14/14] Initial pseudo merge for dist-git setup

[Joshua Roys]

commit d6a32079daecc33d8e9a7ea4bbe849e95842b240
Merge: 325be16 e72e914 a5a9ff6 177adad f92542b f92542b 9ff41f4
Author: Joshua Roys <roysjosh at gmail.com>
Date:   Tue Jul 10 10:26:19 2012 -0400

    Initial pseudo merge for dist-git setup

---