[389-adminutil/f14/master: 3/3] Merge branch 'master' into f14

[Richard Allen Megginson]

commit 0c0cd7ff1f55acd53ffe5d3f69236819fd10367a
Merge: fefd19d 6c0f34f
Author: Rich Megginson <rmeggins at redhat.com>
Date:   Tue Oct 19 10:54:18 2010 -0600

    Merge branch 'master' into f14
    
    Conflicts:
    
    	.gitignore
    	389-adminutil.spec
    	sources

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