[389-adminutil/el5/master: 19/19] Merge branch 'el6' into el5

[Richard Allen Megginson]

commit 8e3d56773c3fe2bd63db54aa7aa0f433653ded1e
Merge: a48a893 eb1dac8
Author: Rich Megginson <rmeggins at redhat.com>
Date:   Tue Oct 19 10:14:26 2010 -0600

    Merge branch 'el6' into el5
    
    Conflicts:
    
    	.gitignore

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