Commit 56feeb13d6ee860c4ba0a1b5020a2a9a55fe67b9

Bruno Haible 2008-04-22T00:01:17

Fix conflict between modules 'canonicalize' and 'canonicalize-lgpl' differently.