[clementine/f16: 4/4] Merge branch 'master' into f16

[Orcan Ogetbil]

commit f6855b3cd5b59d08b8f9087aad652161e33d8a94
Merge: 1badc48 09d8431
Author: Orcan Ogetbil <oget.fedora at gmail.com>
Date:   Sun Jul 8 13:22:34 2012 -0400

    Merge branch 'master' into f16

 clementine-liblastfm1-compatibility.patch |  485 +++++++++++++++++++++++++++++
 clementine.spec                           |   27 +-
 2 files changed, 500 insertions(+), 12 deletions(-)
---