[python-taboot/el6: 2/2] Merge branch 'master' into el6

[Timothy Bielawa]

commit 42fd644f4aa099048d3f827addec11f75e3c98ff
Merge: ce7cc1d b9b910b
Author: Tim Bielawa <tbielawa at redhat.com>
Date:   Thu Aug 4 10:58:02 2011 -0400

    Merge branch 'master' into el6

 .gitignore         |    2 +-
 python-taboot.spec |   29 ++++++++++++++++++++++++++++-
 sources            |    2 +-
 3 files changed, 30 insertions(+), 3 deletions(-)
---