[389-ds-base/f13/master: 68/68] Merge branch 'el6' into el5

[Richard Allen Megginson]

commit 3a4827c1d8339dc06d9b2ba1a20a4d2af691dacd
Merge: 6fae78a 54390b4
Author: Rich Megginson <rmeggins at redhat.com>
Date:   Wed Aug 4 10:43:38 2010 -0600

    Merge branch 'el6' into el5
    
    Conflicts:
    
    	.gitignore
    	389-ds-base-git-local.sh
    	389-ds-base-git.sh
    	389-ds-base.spec
    	sources

 .gitignore               |    3 ++-
 389-ds-base-git-local.sh |    2 +-
 389-ds-base-git.sh       |    2 +-
 389-ds-base.spec         |   18 ++++++++++++++++--
 sources                  |    2 +-
 5 files changed, 21 insertions(+), 6 deletions(-)
---