[rhythmbox: 2/2] Merge commit '6a48c47286964bf2f4e2dee2155d127fdc6b954c'

[Adam Williamson]

commit c2f28afccc4f8a2784773e637d7c0af1d7a1492f
Merge: 6a4ec48 6a48c47
Author: Adam Williamson <awilliam at redhat.com>
Date:   Mon Aug 22 16:38:32 2011 -0700

    Merge commit '6a48c47286964bf2f4e2dee2155d127fdc6b954c'

 .gitignore     |    1 +
 rhythmbox.spec |   27 ++++++++++++++++++++-------
 sources        |    2 +-
 3 files changed, 22 insertions(+), 8 deletions(-)
---