[libcacard/f14/master: 6/6] Merge remote-tracking branch 'origin/master' into f14/master

[Alon Levy]

commit 30fb36241b26922b569ce2de11635ffced51e18d
Merge: 15a9878 b769857
Author: Alon Levy <alevy at redhat.com>
Date:   Thu Feb 10 12:25:23 2011 +0200

    Merge remote-tracking branch 'origin/master' into f14/master
    
    Conflicts:
    	.gitignore
    	libcacard.spec
    	sources

 .gitignore     |    1 +
 libcacard.spec |   11 +++++++++--
 sources        |    2 +-
 3 files changed, 11 insertions(+), 3 deletions(-)
---