Merge branch 'master' of git://github.com/pd-l2ork/pd Conflicts: pd/src/g_all_guis.c pd/src/g_vumeter.c