And deb.in.diff another try

[Roland Illig]

Leonard den Ottolander wrote:
> Hi,
> 
> This is against current CVS. Removed the maps and use q-parameters where
> escaping is needed.

Looks nice. Committed.

Roland