[gnokii/el5/master: 41/41] Merge remote branch 'origin/master' into el5

[Robert Scheck]

commit 3380d504b203159875b2e02c0be63e05a48c5358
Merge: 11662d7 ba166e7
Author: Robert Scheck <robert at fedoraproject.org>
Date:   Thu Dec 30 05:00:09 2010 +0100

    Merge remote branch 'origin/master' into el5
    
    Conflicts:
    	.gitignore
    	gnokii.spec
    	sources

 .gitignore                                         |    3 +-
 ...libgnokii-compile-with-libpcsc-lite-1.6.0.patch |   26 ++++++++++++
 gnokii.spec                                        |   41 ++++++++++++++++----
 sources                                            |    2 +-
 4 files changed, 62 insertions(+), 10 deletions(-)
---