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

[Richard Allen Megginson]

commit d770dae3892eace7565c431c4106a6a493b317b5
Merge: 7595371 de3d65a
Author: Rich Megginson <rmeggins at redhat.com>
Date:   Wed Oct 27 15:42:38 2010 -0600

    Merge branch 'master' into f14

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