merge of '6159b24371b1d635546251f92f5c705343f88b30'
authorMartin Dietze <di@fh-wedel.de>
Mon, 25 Sep 2006 12:44:18 +0000 (12:44 +0000)
committerMartin Dietze <di@fh-wedel.de>
Mon, 25 Sep 2006 12:44:18 +0000 (12:44 +0000)
commitacb686820241239fa43f43f2f5f64a799acb592c
tree5eb115f344ec863d1d9e60597c4d4236ebcb32f8
parentd4c0cdb0f3c6a89c1f24efc582221339ecfd3b59
parentd2bb3d2a055ed2826468187b7373f981a6c10f97
Merge ... '6159b24371b1d635546251f92f5c705343f88b30'
     and 'd6a8fb6a4dc52ff3bda0e3bf30b05a0db05377a1'