[rhythmbox] (2 commits) ...Merge commit '6a48c47286964bf2f4e2dee2155d127fdc6b954c'

[Adam Williamson]

Summary of changes:

  6a48c47... new git snapshot, a few build tweaks (*)
  c2f28af... Merge commit '6a48c47286964bf2f4e2dee2155d127fdc6b954c'

(*) This commit already existed in another branch; no separate mail sent