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

[Matt Domsch]

commit 844df9fd03714a1e5219f15b963aa96e371d00e2
Merge: 0a235da 136c210
Author: Matt Domsch <Matt_Domsch at dell.com>
Date:   Sat Sep 11 22:59:14 2010 -0500

    Merge branch 'master' into f13

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