merge of '49e38996bda7c1309e587226a9c3d152d0bb62e2'
authorccsmart <ccsmart@smartpal.de>
Wed, 17 Jan 2007 20:03:31 +0000 (20:03 +0000)
committerccsmart <ccsmart@smartpal.de>
Wed, 17 Jan 2007 20:03:31 +0000 (20:03 +0000)
commitae6b880bc785a04119f3db1184ac615e9d92665b
treec9a67470cf38f7711714e5a450fd2701aed547ce
parentb4ec03df90824ca0f7c1130ef19f40724b800c3b
parentb6721d7c163c3ed5f53fcadeee416a9ca5ba2609
Merge ... '49e38996bda7c1309e587226a9c3d152d0bb62e2'
     and '8458cc771a74a1ab393f4fb0a2c3b69c419daad3'