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

[Richard Allen Megginson]

commit c1c5b32ae3062fe0e2cf3bb2e5c9c058a2145512
Merge: e9560d3 4e0891b
Author: Rich Megginson <rmeggins at redhat.com>
Date:   Tue Oct 26 19:57:03 2010 -0600

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

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