[rubygem-net-ldap/f17: 2/2] Merge branch 'master', remote-tracking branch 'origin' into f17

[Bohuslav Kabrda]

commit a07dec08318f1de23d6fcdba74699674761cd082
Merge: e14d6d6 e669ded
Author: Bohuslav Kabrda <bkabrda at redhat.com>
Date:   Tue Feb 28 15:44:28 2012 +0100

    Merge branch 'master', remote-tracking branch 'origin' into f17

 rubygem-net-ldap.spec |    8 ++++++--
 1 files changed, 6 insertions(+), 2 deletions(-)
---