[bcfg2/el5: 4/4] Merge branch 'master' into el5

[John Morris]

commit 3539b1fe0acf2608b3aa87c81ed6e9b8e9833dc8
Merge: e9e6644 79aecb5
Author: John Morris <john at zultron.com>
Date:   Thu Feb 27 02:10:47 2014 -0600

    Merge branch 'master' into el5
    
    Conflicts:
    	bcfg2.spec

 bcfg2.spec |   11 ++++-------
 1 files changed, 4 insertions(+), 7 deletions(-)
---