[RBTools/el5: 2/12] Merge branch 'master' into el5

[Stephen Gallagher]

commit 4200f30f99f3940906d487e0fb8ed20189ba7484
Merge: 20eca45 ef81286
Author: Stephen Gallagher <sgallagh at redhat.com>
Date:   Tue Apr 8 13:42:14 2014 -0400

    Merge branch 'master' into el5

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