[bitlbee/el4/master: 7/7] Merge branch 'el5' into el4

[Matej Cepl]

commit 3f8aedfce62fb398caafb865f666447fda5fb000
Merge: aefbc2f 44ce5bd
Author: Matěj Cepl <mcepl at redhat.com>
Date:   Mon Dec 27 13:49:56 2010 +0100

    Merge branch 'el5' into el4

 bitlbee-des3-implement.patch |  118 ++++++++++
 bitlbee-libresolv.patch      |  529 +++++++++++++++---------------------------
 bitlbee-ssl_pending.patch    |   19 ++
 bitlbee.spec                 |   22 ++-
 4 files changed, 339 insertions(+), 349 deletions(-)
---