Pull in a few changes in the gnome-music git repository.

[1] commits 118f270f9b and e357c1fcda


git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@19714 df743ca5-7f9a-e211-a948-0013205c9059