[dev] Merk update

[Duck]

--Boundary-00=_W15aC4Ez6aJUmpy
Content-Type: text/plain;
  charset="us-ascii"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline

- clean up nested spaces in the code
- checkout and invoice templates clean up
- stores the tax total value in the invoice table
- correctly display tax in checkout, invoice and invoice print view
- fix state/country mix in the invoice print view

PS: patch is only one gzipped cvs diff file

Duck

--Boundary-00=_W15aC4Ez6aJUmpy
Content-Disposition: attachment;
	filename="merk.diff.gz"
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit

A non-text attachment was scrubbed...
Name: merk.diff.gz
Type: application/x-gzip
Size: 7018 bytes
Desc: not available
Url : http://lists.horde.org/archives/dev/attachments/20050424/073b71ed/merk.diff.bin

--Boundary-00=_W15aC4Ez6aJUmpy--