Another try to fix Makefile.am by duplicating entries (less elegant but this time should work)
Authored by: bcornec 2007-10-18
Parent: [r699]
Child: [r701]
