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

[Matej Cepl]

commit 03001269218791340c1f6d73882df1ed0a5caf6c
Merge: be351f6 1f2ca1b
Author: Matěj Cepl <mcepl at redhat.com>
Date:   Sat Dec 4 17:28:48 2010 +0100

    Merge branch 'master' into f14
    
    Conflicts:
    	bitlbee.spec

 .gitignore                      |    1 +
 bitlbee-configure-eclipse.patch |   15 ----
 bitlbee-nss.patch               |  170 ---------------------------------------
 bitlbee.spec                    |   46 +++++++----
 sources                         |    2 +-
 5 files changed, 33 insertions(+), 201 deletions(-)
---