conflict resolved.
Merge ricardo

Conflicts:
	vmm_ext.h