[bitlbee/f14/master: 2/2] Merge branch 'master' into f14

[Matej Cepl]

commit 41cf3e4828df5f9213a5d6938efae8f1730b31e3
Merge: 9493a4f 53d0801
Author: Matěj Cepl <mcepl at redhat.com>
Date:   Sun Dec 26 18:37:09 2010 +0100

    Merge branch 'master' into f14

 bitlbee-des3-implement.patch |  118 ++++++++++++++++++++++++++++++++++++++++++
 bitlbee.spec                 |    9 +++-
 2 files changed, 126 insertions(+), 1 deletions(-)
---