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

[Richard Allen Megginson]

commit 44ab848059c95e8b444a864595d2c562a5f7c2b5
Merge: 0c0cd7f e5486af
Author: Rich Megginson <rmeggins at redhat.com>
Date:   Fri Oct 22 15:13:46 2010 -0600

    Merge branch 'master' into f14

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