ChangeLog: Fix a merge bug.
authorFlorian Forster <sifnfors@faui02l.informatik.uni-erlangen.de>
Mon, 10 Sep 2007 08:43:19 +0000 (10:43 +0200)
committerFlorian Forster <sifnfors@faui02l.informatik.uni-erlangen.de>
Mon, 10 Sep 2007 08:43:19 +0000 (10:43 +0200)
commit59d8ed329bdad86d73152c00e9e582f1086cef8b
tree063b2efcb6d2a6092b052ad54ada2d6d4e6e23ed
parentb0378fa288fd429d66d5d6854e63a371831013f0
ChangeLog: Fix a merge bug.
ChangeLog