Thomas Vander Stichele 59a7287480 merge back from release
Original commit message from CVS:
merge back from release
2003-01-08 16:41:27 +00:00
..
2003-01-08 16:41:27 +00:00
2003-01-07 19:13:41 +00:00