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

[Robert Scheck]

commit 78af5f8735f410aef1b5bdadcf55c240682b94d1
Merge: 609665d ba166e7
Author: Robert Scheck <robert at fedoraproject.org>
Date:   Thu Dec 30 04:22:52 2010 +0100

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

 .gitignore                                         |    2 +-
 ...libgnokii-compile-with-libpcsc-lite-1.6.0.patch |   26 ++++++++++++++++++++
 gnokii.spec                                        |    9 ++++++-
 sources                                            |    2 +-
 4 files changed, 36 insertions(+), 3 deletions(-)
---
diff --cc .gitignore
index 54c2595,49c00c3..943273c
--- a/.gitignore
+++ b/.gitignore
@@@ -1,1 -1,2 +1,1 @@@
--gnokii-0.6.28.tar.bz2
 -/gnokii-0.6.29.tar.bz2
++gnokii-0.6.29.tar.bz2