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

[Stephen Gallagher]

commit b92a80dca6abbe3f20934d9d2893186d8daf5ca3
Merge: 86a0d5c d9b9b5c
Author: Stephen Gallagher <sgallagh at redhat.com>
Date:   Wed Jan 15 09:34:12 2014 -0500

    Merge branch 'master' into el6

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