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

[Rex Dieter]

commit e802fba76de1dbe78391eb6543227b4dbf4f9d82
Merge: dcfda78 9a1dc8f
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Sat Sep 25 15:24:47 2010 -0500

    Merge branch 'master' into f12

 .gitignore     |    2 +-
 liblastfm.spec |   11 ++++++++---
 sources        |    2 +-
 3 files changed, 10 insertions(+), 5 deletions(-)
---