fix up ChangeLog after merge
authorTomas Frydrych <tf@openedhand.com>
Thu, 31 May 2007 19:14:37 +0000 (19:14 +0000)
committerTomas Frydrych <tf@openedhand.com>
Thu, 31 May 2007 19:14:37 +0000 (19:14 +0000)
commitccc1494f6d41d7b9935ab7f9d61206d2665e4f0e
treeca7403541a910ddbdf37fa56e21998675dcbca2f
parente2cc64faa29c27d726eb43bcfb7ae39bbac62fee
fix up ChangeLog after merge
ChangeLog