[amarok/f14: 2/2] Merge branch 'master' into f14

[Rex Dieter]

commit b36fb5984d6944042ec0353a4d2f793e4faa469d
Merge: 26115c8 d9f764e
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Fri Sep 16 15:16:59 2011 -0500

    Merge branch 'master' into f14

 amarok.spec |    7 ++++---
 1 files changed, 4 insertions(+), 3 deletions(-)
---