merge of '09fce21ef9143343e04d95aa6ad19ddae5e6bc08'
authorRolf Leggewie <oe-devel@rolf.leggewie.biz>
Fri, 5 Jan 2007 14:36:04 +0000 (14:36 +0000)
committerRolf Leggewie <oe-devel@rolf.leggewie.biz>
Fri, 5 Jan 2007 14:36:04 +0000 (14:36 +0000)
     and 'fb3e676095ae8da1e4da5e20f0a928a476c9302b'


Trivial merge