Work around bazaar merges not liking conflicts.
Merge branch 'master' of github.com:compholio/wine-compholio-daily