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

[Stephen Gallagher]

commit 86a0d5c977e93ffd2169160437188ae821162632
Merge: 86a3294 ae820a1
Author: Stephen Gallagher <sgallagh at redhat.com>
Date:   Mon Jan 6 08:31:12 2014 -0500

    Merge branch 'master' into el6

 .gitignore   |    1 +
 RBTools.spec |    6 +++++-
 sources      |    2 +-
 3 files changed, 7 insertions(+), 2 deletions(-)
---