[mobile-broadband-provider-info/f13/master: 6/6] Merge branch 'master' into f13

[Matej Cepl]

commit 05f3118fae37bfd94e4c60ff3427c973b7d1e35a
Merge: a339c1d 2a63db3
Author: Matěj Cepl <mcepl at redhat.com>
Date:   Fri Feb 18 21:29:41 2011 +0100

    Merge branch 'master' into f13
    
    Conflicts:
    	.gitignore

 mobile-broadband-provider-info.spec |   33 ++++++++++++++++++++++++++++++---
 sources                             |    2 +-
 2 files changed, 31 insertions(+), 4 deletions(-)
---