[openldap/f17: 3/3] merge master and f17 to have the same history

[jvcelak]

commit df6cf45ec2fb4084388d45aebbb0bf7ee0dd8497
Merge: 8453acd 440b96e
Author: Jan Vcelak <jvcelak at redhat.com>
Date:   Thu Apr 5 20:46:12 2012 +0200

    merge master and f17 to have the same history

 openldap.spec |    5 ++++-
 1 files changed, 4 insertions(+), 1 deletions(-)
---