Commit 44af232c837312900f7d5c0ad58c2d52cdc8aa8f

Daniel Veillard 2009-07-09T09:02:11

Fix ChangeLog merge conflict