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

[Rex Dieter]

commit 5a152fb223e4c833b47bd9db9974fe9f44175ccf
Merge: 2994250 9a1dc8f
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Sat Sep 25 15:24:22 2010 -0500

    Merge branch 'master' into f13

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