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

[Richard Allen Megginson]

commit 0d4a4b1db86925216123fbb4c999b4df384ad2f3
Merge: c7e1760 5fd2662
Author: Rich Megginson <rmeggins at redhat.com>
Date:   Thu Aug 26 15:26:16 2010 -0600

    Merge branch 'master' into el6

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