merge of 'b9e76f0e822d1bf37547e1f35a2e99e03a4778d2'
authorccsmart <ccsmart@smartpal.de>
Wed, 17 Jan 2007 21:02:36 +0000 (21:02 +0000)
committerccsmart <ccsmart@smartpal.de>
Wed, 17 Jan 2007 21:02:36 +0000 (21:02 +0000)
     and 'f153b8326a1b54784546fd79fd429fdc1af0089b'


Trivial merge