merge of '4989371c8e7cec943a964b459ec3e71c0f547204'
authorRolf Leggewie <oe-devel@rolf.leggewie.biz>
Sat, 12 Jan 2008 14:16:40 +0000 (14:16 +0000)
committerRolf Leggewie <oe-devel@rolf.leggewie.biz>
Sat, 12 Jan 2008 14:16:40 +0000 (14:16 +0000)
     and 'a541f884d07223a5c7e560a0e5732d213098f838'


Trivial merge