commit 8955fda496078ca8cfcda8fc4b20096f57aad1d8 Merge: 2d9fa26 7bfb831 Author: Rich Megginson <rmeggins at redhat.com> Date: Wed Oct 20 10:12:14 2010 -0600 Merge branch 'f12' into el6 389-ds-base.spec | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) ---