[389-dsgw/el6/master: 6/6] Merge branch 'f13' into el6

[Richard Allen Megginson]

commit 40beac8cd975b10f026545d779a8cbede6a522d0
Merge: 04e463f 4e0891b
Author: Rich Megginson <rmeggins at redhat.com>
Date:   Tue Oct 26 19:58:46 2010 -0600

    Merge branch 'f13' into el6
    
    Conflicts:
    
    	.gitignore
    	389-dsgw.spec
    	sources

 .gitignore    |    3 ++-
 389-dsgw.spec |    6 +++++-
 sources       |    2 +-
 3 files changed, 8 insertions(+), 3 deletions(-)
---