merged from 1.9

This commit is contained in:
urs_hunkler 2007-10-18 19:03:39 +00:00
parent b738808bb3
commit 6487c75230