heavily modified both sets of code, and I think it's useful for people to
know who's responsible/familiar with what.

git-svn-id: https://svn.musicpd.org/mpd/trunk@6272 09075e82-0dd4-0310-85a5-a0d7c8717e4f