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

[Matej Cepl]

commit 8d82327757f4fb412785b78d82b687827e01e6ce
Merge: d3fbd4e f55b693
Author: Matěj Cepl <mcepl at redhat.com>
Date:   Mon Nov 22 20:20:03 2010 +0100

    Merge branch 'master' into el6

 .gitignore                      |    2 +-
 bitlbee-1.2.8-strtoll.patch     |   23 --
 bitlbee-configure-eclipse.patch |   15 ++
 bitlbee-installP.patch          |   48 +++++
 bitlbee-libresolv.patch         |  440 +++++++++++++++++++++++++++++++++++++++
 bitlbee-nss.patch               |  170 +++++++++++++++
 bitlbee-syslibdirs.patch        |   12 +
 bitlbee.spec                    |   38 ++--
 8 files changed, 706 insertions(+), 42 deletions(-)
---