Merge proposals dependent on lp://staging/~taktik/openobject-server/7.0-trunk-generate-xml-unittest

lp://staging/~taktik/openobject-server/7.0-trunk-generate-xml-unittest has no merge proposals.