tree f657f1c700062ad1b2160fba4ee62a95cf5c13e8
parent 23c04ff901c18cae58769a4570158933352ff3b7
author Thomas Vander Stichele <thomas@apestaart.org> 1018862822 +0000
committer Thomas Vander Stichele <thomas@apestaart.org> 1018862822 +0000

more mergeback from the latest release

Original commit message from CVS:
more mergeback from the latest release