[bitlbee/el6/master: 6/6] Merge branch 'master' into el6

[Matej Cepl]

commit cb4544be1ec640138bba5426d3b469a0446e8d80
Merge: 05ac82e 3d85263
Author: Matěj Cepl <mcepl at redhat.com>
Date:   Tue Dec 28 16:53:57 2010 +0100

    Merge branch 'master' into el6

 bitlbee-des3-implement.patch |  120 ++++++++++
 bitlbee-forkdaemon.patch     |   20 ++
 bitlbee-libresolv.patch      |  529 +++++++++++++++---------------------------
 bitlbee-ssl_pending.patch    |   19 ++
 bitlbee-systemd.patch        |  164 +++++++++++++
 bitlbee.spec                 |   50 ++++-
 6 files changed, 552 insertions(+), 350 deletions(-)
---