merge of 'd1370b15e175b1b3cf370e0d9464e6db9893326a'
authorRolf Leggewie <oe-devel@rolf.leggewie.biz>
Thu, 8 Feb 2007 10:29:19 +0000 (10:29 +0000)
committerRolf Leggewie <oe-devel@rolf.leggewie.biz>
Thu, 8 Feb 2007 10:29:19 +0000 (10:29 +0000)
     and 'd49c7a5854a653df449e557102e3fbec0192fa4e'


Trivial merge