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

[John Morris]

commit df2c3416e2ca89b210702377609291f156eb0a70
Merge: 00d5799 79aecb5
Author: John Morris <john at zultron.com>
Date:   Thu Feb 27 02:08:23 2014 -0600

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

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