[chkconfig/f13/master: 7/7] Merge branch 'master' into f13

[Bill Nottingham]

commit 8b7ead5417434750c2e7fc35896ff9a16afdace2
Merge: 2044233 1fad469
Author: Bill Nottingham <notting at redhat.com>
Date:   Wed Oct 27 12:23:01 2010 -0400

    Merge branch 'master' into f13

 .gitignore     |    2 +-
 chkconfig.spec |   11 ++++++++++-
 sources        |    2 +-
 3 files changed, 12 insertions(+), 3 deletions(-)
---
diff --cc .gitignore
index 11d99c6,3593d1b..226bcd4
--- a/.gitignore
+++ b/.gitignore
@@@ -1,1 -1,3 +1,1 @@@
- chkconfig-1.3.45.tar.bz2
 -chkconfig-1.3.46.tar.bz2
 -chkconfig-1.3.47.tar.bz2
+ /chkconfig-1.3.48.tar.bz2