trunk: changeset 1641
trunk: changeset 1641

Fixes to previous failed commit.

darcs-hash:20040726205037-e481e-969b5d42a9bc9978ade7c8715ae07695dbf12ad7.gz

anoduck/notion,dkogan/notion,dkogan/notion.xfttest,dkogan/notion,knixeur/notion,raboof/notion,raboof/notion,p5n/notion,dkogan/notion,dkogan/notion,dkogan/notion.xfttest,anoduck/notion,neg-serg/notion,knixeur/notion,p5n/notion,raboof/notion,knixeur/notion,neg-serg/notion,dkogan/notion,dkogan/notion.xfttest,neg-serg/notion,knixeur/notion,raboof/notion,p5n/notion,knixeur/notion,anoduck/notion,p5n/notion,anoduck/notion,neg-serg/notion,anoduck/notion,p5n/notion,dkogan/notion.xfttest