commit 9240648068f7ed469cf9aa3a7af6730f68cb6231 Merge: 203dc77 ddf5c01 Author: Rich Megginson <rmeggins at redhat.com> Date: Fri Oct 22 15:27:34 2010 -0600 Merge branch 'f13' into f12 .gitignore | 2 +- 389-adminutil.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 3 deletions(-) ---