tree 89e47c1b6551ce33cd7c97275dfa61c67bdf5b4c
parent 3e4f2fac8b6c4729347152b48d076928af1ff9b0
author Thomas Vander Stichele <thomas@apestaart.org> 1026211537 +0000
committer Thomas Vander Stichele <thomas@apestaart.org> 1026211537 +0000

merge from release branch

Original commit message from CVS:
merge from release branch