Comment 188 for bug 988601

Merging the changes from trunk was not an easy job. Several changes had to be pushed manually, especially those from trunk r12471 (which may also affect further wmf/emf coding). I'd love to see the changes and bugfixes in the lp988601 branch go into the main development branch.

David, what needs to be done for this? Is there anything that is broken in this branch? Is there some cleanup needed?