[bitlbee/f12/master: 45/45] Merge branch 'master' into f12

[Matej Cepl]

commit 68d1241e4421d3abd3c8bd371e74050e3ac47793
Merge: 21e6bb2 c265e0d
Author: Matěj Cepl <mcepl at redhat.com>
Date:   Mon Nov 22 19:03:22 2010 +0100

    Merge branch 'master' into f12
    
    Conflicts:
    	.gitignore
    	bitlbee-1.2.3-libresolv.patch
    	bitlbee-1.2.7-libresolv.patch
    	bitlbee-libresolv.patch
    	bitlbee.spec
    	sources

 .gitignore                                         |    2 +-
 bitlbee-1.2.8-strtoll.patch                        |   23 ---
 bitlbee-configure-eclipse.patch                    |   15 ++
 bitlbee-installP.patch                             |   48 ++++++
 ....2.7-libresolv.patch => bitlbee-libresolv.patch |  152 +++++++++---------
 bitlbee-nss.patch                                  |  170 ++++++++++++++++++++
 bitlbee-syslibdirs.patch                           |   12 ++
 bitlbee.spec                                       |   43 +++---
 sources                                            |    2 +-
 9 files changed, 349 insertions(+), 118 deletions(-)
---
diff --cc .gitignore
index 77005cf,f2e090d..ae6f750
--- a/.gitignore
+++ b/.gitignore
@@@ -1,1 -1,2 +1,1 @@@
--bitlbee-1.2.8.tar.gz
+ bitlbee-3.0.tar.gz