[openstack-sahara/el6-icehouse: 7/7] Merge branch 'el6' into el6-icehouse

[Rex Dieter]

commit e46bb96af5b5b9747501d4b5cd69e238f1e9ae64
Merge: 685ee31 2eaeba9
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Tue May 6 09:11:16 2014 -0500

    Merge branch 'el6' into el6-icehouse
    
    Conflicts:
    	.gitignore
    	sources

 .gitignore                   |    1 -
 dead.package                 |    1 +
 openstack-sahara-api.init    |  103 --------------
 openstack-sahara-api.service |   11 --
 openstack-sahara.spec        |  318 ------------------------------------------
 sources                      |    1 -
 6 files changed, 1 insertions(+), 434 deletions(-)
---