Changes from MDE's dev branch merged to trunk

I've merged my bug fixes into the trunk. Please let me know
if anything 
seems out of place. Thanks.


Matthew
_______________________________________________
cosmo-dev mailing list
cosmo-devlists.osafoundation.org
http://lists.osafoundation.org/mailman/listinfo/cosmo-d
ev