commit 211da7f5213ab92c24b91e954aae7765a6f9aade Merge: d6094ea a821642 Author: Matt Domsch <Matt_Domsch at dell.com> Date: Sun Aug 1 19:56:32 2010 -0500 merge master into el6 .gitignore | 2 +- mirrormanager.spec | 12 +++++++++++- sources | 2 +- 3 files changed, 13 insertions(+), 3 deletions(-) ---