commit 59a7a0ad3ad1dde95ce924c7c874014fa6d044cc Merge: c0c604b ddf5c01 Author: Rich Megginson <rmeggins at redhat.com> Date: Fri Oct 22 15:28:46 2010 -0600 Merge branch 'f13' into el6 .gitignore | 2 +- 389-adminutil.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 3 deletions(-) ---