Commit bbfe77bf4eb6bfbc30f5a02b10f9c5494471803f

Stefano Lattarini 2010-11-05T00:03:10

Fix ChangeLog after merge