[liblastfm/f12/master: 5/5] Merge branch 'master' into f12

[Rex Dieter]

commit dcfda78d32dd082a3f1c620d1186e86941f50a06
Merge: 1f3500f d07d0ef
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Fri Sep 17 08:14:04 2010 -0500

    Merge branch 'master' into f12
    
    Conflicts:
    	.gitignore

 .gitignore                  |    2 +-
 liblastfm-0.3.0-qmake.patch |   19 -------------------
 liblastfm-0.3.2-qmake.patch |   31 +++++++++++++++++++++++++++++++
 liblastfm.spec              |   17 +++++++++++------
 sources                     |    2 +-
 5 files changed, 44 insertions(+), 27 deletions(-)
---