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

[Timothy Bielawa]

commit 13b67a4284c88c7a4f1b2e2db63927e0615c2a3a
Merge: a5222ae b9b910b
Author: Tim Bielawa <tbielawa at redhat.com>
Date:   Thu Aug 4 10:57:28 2011 -0400

    Merge branch 'master' into el5

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