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

[Stephen Gallagher]

commit fbc24cbdd0cc883ab4d7ad4f3571992262f8c4fa
Merge: f9dea1d c7185d9
Author: Stephen Gallagher <sgallagh at redhat.com>
Date:   Mon Aug 22 12:08:34 2011 -0400

    Merge branch 'master' into el6

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