[mirrormanager: 21/21] merge changes for v1.3.6 from el5 to master

[Matt Domsch]

commit a821642bf005bd91aab0fe31303f0e148ee6d9c0
Merge: 9960af6 abae6f2
Author: Matt Domsch <Matt_Domsch at dell.com>
Date:   Sun Aug 1 15:56:04 2010 -0500

    merge changes for v1.3.6 from el5 to master

 .gitignore         |    2 +-
 mirrormanager.spec |   12 +++++++++++-
 sources            |    2 +-
 3 files changed, 13 insertions(+), 3 deletions(-)
---
diff --cc .gitignore
index d32a068,bac0b85..6c3a1e5
--- a/.gitignore
+++ b/.gitignore
@@@ -1,1 -1,2 +1,1 @@@
--mirrormanager-1.3.5.tar.bz2
+ mirrormanager-1.3.6.tar.bz2