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

[Matt Domsch]

commit 4988376e747be2e999d0be684aa62459d6a004ad
Merge: 211da7f 136c210
Author: Matt Domsch <Matt_Domsch at dell.com>
Date:   Sat Sep 11 22:57:16 2010 -0500

    Merge branch 'master' into el6

 .gitignore         |    1 +
 mirrormanager.spec |    7 ++++++-
 sources            |    2 +-
 3 files changed, 8 insertions(+), 2 deletions(-)
---