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

[Richard Allen Megginson]

commit c0428175a16e5fbb8cebfa37a2b097c8f2df9c29
Merge: 6d0a1c7 4e0891b
Author: Rich Megginson <rmeggins at redhat.com>
Date:   Tue Oct 26 20:01:37 2010 -0600

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

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