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

[Richard Allen Megginson]

commit 54390b4b6b18d050abce20bf89e7cf9d31d0fa8b
Merge: c1b5857 cbbebc3
Author: Rich Megginson <rmeggins at redhat.com>
Date:   Wed Aug 4 10:39:17 2010 -0600

    Merge branch 'f12' into el6
    
    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(-)
---