Merge branch 'master' of git://sparkle/Mouse/mousemuck