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

[Richard Allen Megginson]

commit 054a73217e8b729fabc0f29d304f1f2612694e68
Merge: 0e1393e 5fd2662
Author: Rich Megginson <rmeggins at redhat.com>
Date:   Thu Aug 26 15:26:03 2010 -0600

    Merge branch 'master' into f12

 389-ds-base.spec |    6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)
---