[389-ds-base/f12/master: 2/2] Merge branch 'f13' into f12

[Richard Allen Megginson]

commit 92e640accd78e1fc8cc25f56eff7a06ae936b089
Merge: 088ea92 57c9f0a
Author: Rich Megginson <rmeggins at redhat.com>
Date:   Wed Oct 27 17:29:26 2010 -0600

    Merge branch 'f13' into f12

 389-ds-base.spec |    7 ++++++-
 sources          |    2 +-
 2 files changed, 7 insertions(+), 2 deletions(-)
---