[389-adminutil/el6/master: 13/16] Merge branch 'f12' into el6

[Richard Allen Megginson]

commit eb1dac8cdde4d692b88d83628c22a72957f21304
Merge: ccbba57 d79f1b6
Author: Rich Megginson <rmeggins at redhat.com>
Date:   Tue Oct 19 10:13:03 2010 -0600

    Merge branch 'f12' into el6
    
    Conflicts:
    
    	.gitignore
    	389-adminutil.spec
    	sources

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