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

[Stephen Gallagher]

commit 06e67746ba97baabac34cfdb954323f7c9d1ae1f
Merge: 9683318 be290a8
Author: Stephen Gallagher <sgallagh at redhat.com>
Date:   Thu May 30 08:47:36 2013 -0400

    Merge branch 'master' into el6

 .gitignore                                         |    3 +
 ...1-Disable-ez_setup-when-installing-by-RPM.patch |   27 ------
 RBTools.spec                                       |   90 ++++++++++++++++++--
 sources                                            |    2 +-
 4 files changed, 86 insertions(+), 36 deletions(-)
---