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

[Robert Scheck]

commit 4c3163fb04361bc3fc0822a82413c925cff9d8d9
Merge: 3380d50 aad35bb
Author: Robert Scheck <robert at fedoraproject.org>
Date:   Sun Oct 9 02:18:42 2011 +0200

    Merge remote branch 'origin/master' into el5

 .gitignore                                         |    1 +
 ...libgnokii-compile-with-libpcsc-lite-1.6.0.patch |   26 ------------
 gnokii.spec                                        |   43 +++++++++++++++-----
 sources                                            |    2 +-
 4 files changed, 34 insertions(+), 38 deletions(-)
---