[mirrormanager/f13/master: 24/24] merge master to f13

[Matt Domsch]

commit 0a235daed9564a8e9cf0fe4267abc51b7f632c83
Merge: 25c1cff a821642
Author: Matt Domsch <Matt_Domsch at dell.com>
Date:   Sun Aug 1 19:53:16 2010 -0500

    merge master to f13

 .gitignore                               |    2 +-
 mirrormanager-1.3.3-confirm-delete.patch |   30 ------------
 mirrormanager.spec                       |   73 +++++++++++++++++++++++++++---
 sources                                  |    2 +-
 4 files changed, 68 insertions(+), 39 deletions(-)
---