[rhythmbox: 2/2] Merge commit '947f760975d91d9cf9ed87c95c64b1c95ece7dd7'

[Adam Williamson]

commit 5b6e34d7212d8db3da7464eb3a92d13f944cc2ef
Merge: c2f28af 947f760
Author: Adam Williamson <awilliam at redhat.com>
Date:   Tue Aug 23 10:03:34 2011 -0700

    Merge commit '947f760975d91d9cf9ed87c95c64b1c95ece7dd7'

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