[bitlbee: 2/2] Merge commit 'bdd602bcdf7d58a75436e26ed62366f92e1d22d6'

[Adam Williamson]

commit 9e0d600bca46015068dd59ef857c2be64386074c
Merge: 85e36aa bdd602b
Author: Adam Williamson <awilliam at redhat.com>
Date:   Tue Dec 6 12:06:40 2011 -0800

    Merge commit 'bdd602bcdf7d58a75436e26ed62366f92e1d22d6'

 .gitignore               |    1 +
 823_822.diff             |   31 -------------------------------
 bitlbee-syslibdirs.patch |    2 +-
 bitlbee.spec             |   11 ++++++-----
 sources                  |    2 +-
 5 files changed, 9 insertions(+), 38 deletions(-)
---