Notes: * blenderbuttons and ICON_SNAP_PEEL_OBJECT were not merged.
- blenderplayer and the web plugin now compile again (now using OpenAL)