[bcfg2/el5: 50/52] Merge 'master' into el5: 1.3.3 upstream specfile reconciliation

[John Morris]

commit 431307ffbfbdaecf2b70c655394d8945e61d4ce4
Merge: 29708cc 316afe0
Author: John Morris <john at zultron.com>
Date:   Sat Nov 23 14:44:58 2013 -0600

    Merge 'master' into el5:  1.3.3 upstream specfile reconciliation
    
    Merging with master
    - specfile reconciliation with upstream
    - update to 1.3.3
    
    Conflicts:
    	.gitignore
    	bcfg2.spec
    	branch
    	sources

 .gitignore |   19 +-
 bcfg2.spec |  956 ++++++++++++++++++++++++++++++++++++++++++++++--------------
 branch     |    5 -
 sources    |    4 +-
 4 files changed, 746 insertions(+), 238 deletions(-)
---