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)
     and '8458cc771a74a1ab393f4fb0a2c3b69c419daad3'


Trivial merge