[bitlbee/f14: 8/8] Merge remote branch 'origin/master' into f14

[Robert Scheck]

commit 98abc6276a2c1acdc186839a2a56db99a71c6c28
Merge: 5ce2cde 85e36aa
Author: Robert Scheck <robert at fedoraproject.org>
Date:   Tue Nov 22 01:19:43 2011 +0100

    Merge remote branch 'origin/master' into f14

 823_822.diff          |   31 +++++++++++++++++++++++++++++++
 bitlbee-systemd.patch |    5 +++--
 bitlbee.spec          |   31 ++++++++++++++++++++++---------
 3 files changed, 56 insertions(+), 11 deletions(-)
---