Comment 6 for bug 931936

I haven't done a thorough look at the merge yet but on a first look it looks good.
You just need to rework your new changelog entry as all changes from 0.204ubuntu1 and 0.204ubuntu2 still apply (and are in your debdiff included) but not mentioned as remaining changes in your changelog entry. And your changelog entry should target "precise" (the current development version) instead of "oneiric".

Please recheck if those (old) changes are still there and mention them in remaining changes.