Merge branch 'osx' of git://gitorious.org/~flameeyes/pulseaudio/flameeyes-pulseaudio