Vmware 2.1 aka UC6 Meter for VMware 3.4.5 aka Engine Room 2.1

This code is in production.  Merge it!