summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk.Thomas Wouters2006-05-271-0/+5