[liblastfm/f13/master: 4/4] Merge branch 'master' into f13

[Rex Dieter]

commit 2994250e8eef0b1bccf30ef9741aba25ce50cbc8
Merge: a612272 d07d0ef
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Fri Sep 17 08:12:56 2010 -0500

    Merge branch 'master' into f13
    
    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(-)
---