Merge main 5.0 with 5.0-build,

automerge didn't handle this correctly,
so test "view" was corrected manually.
This commit is contained in:
Joerg Bruehe 2009-08-11 18:59:20 +02:00
commit 2f87dd3eee

Diff content is not available