[rhythmbox: 6/6] Merge commit '49d010638fd4ddc22e875e4cf968976590dd10da'

[Adam Williamson]

commit 4a4e51c5515b1d81041f522a2cb2669f0fb9b915
Merge: 5b6e34d 49d0106
Author: Adam Williamson <awilliam at redhat.com>
Date:   Fri Nov 4 17:19:04 2011 -0700

    Merge commit '49d010638fd4ddc22e875e4cf968976590dd10da'

 .gitignore     |    3 +++
 rhythmbox.spec |   53 +++++++++++++++++++++++++----------------------------
 sources        |    2 +-
 3 files changed, 29 insertions(+), 29 deletions(-)
---