Merge from trunk.
commit806fe9b172c0767e6d6fc715bf2ef65eade074d4
authorMartin Rudalics <rudalics@gmx.at>
Tue, 22 Jun 2010 14:23:53 +0000 (22 16:23 +0200)
committerMartin Rudalics <rudalics@gmx.at>
Tue, 22 Jun 2010 14:23:53 +0000 (22 16:23 +0200)
treee36c30170f481c7c1326d9b89b7371749ffd70e5
parent83d54ad4239f16307394fa1eb924d1fca3763d0e
parentbc869eca8c91810c66ead464b57630ccebabaf29
Merge from trunk.
src/ChangeLog