Rainer Gerhards b849df2004 Merge branch 'master' into perf
Conflicts:

	ChangeLog
2008-10-06 12:07:53 +02:00
..
2008-10-02 11:44:50 +02:00