oi marco
Merge macpipo.local:tmp/misc
Fixing pipo stuff.