[gnokii/f15: 3/3] Merge remote branch 'origin/master' into f15

[Robert Scheck]

commit cd929714bd8a6ce8ef303263656216077cb36967
Merge: 56957a0 aad35bb
Author: Robert Scheck <robert at fedoraproject.org>
Date:   Sun Oct 9 02:17:42 2011 +0200

    Merge remote branch 'origin/master' into f15
    
    Conflicts:
    	gnokii.spec

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