[scponly/el6: 13/15] Merge branch 'master' into el6

[David Brown]

commit 34595cc2150a615f4963b6bd3e652b013463b7c3
Merge: c7670ed 9adfb9b
Author: David Brown <dmlb2000 at gmail.com>
Date:   Tue Oct 14 22:07:09 2014 -0700

    Merge branch 'master' into el6

 scponly.spec |   32 ++++++++++++++++++++++++++++++--
 1 files changed, 30 insertions(+), 2 deletions(-)
---