[gnokii/el6: 4/4] Merge remote branch 'origin/master' into el6

[Robert Scheck]

commit 2f27b86a7319ef68bd125b7ef5feaf146e8cfb2d
Merge: 78af5f8 aad35bb
Author: Robert Scheck <robert at fedoraproject.org>
Date:   Sun Oct 9 02:18:23 2011 +0200

    Merge remote branch 'origin/master' into el6
    
    Conflicts:
    	.gitignore

 .gitignore                                         |    2 +-
 ...libgnokii-compile-with-libpcsc-lite-1.6.0.patch |   26 ------------
 gnokii.spec                                        |   43 +++++++++++++++-----
 sources                                            |    2 +-
 4 files changed, 34 insertions(+), 39 deletions(-)
---
diff --cc .gitignore
index 943273c,69c4253..f3e000d
--- a/.gitignore
+++ b/.gitignore
@@@ -1,1 -1,3 +1,1 @@@
- gnokii-0.6.29.tar.bz2
 -gnokii-0.6.28.tar.bz2
 -/gnokii-0.6.29.tar.bz2
 -/gnokii-0.6.30.tar.bz2
++gnokii-0.6.30.tar.bz2