merge of 'a1ac08321d149b2fdf0a8556eee3e9606457d69c'
authorRolf Leggewie <oe-devel@rolf.leggewie.biz>
Sat, 16 Dec 2006 14:01:34 +0000 (14:01 +0000)
committerRolf Leggewie <oe-devel@rolf.leggewie.biz>
Sat, 16 Dec 2006 14:01:34 +0000 (14:01 +0000)
     and 'f8367e2de589c7255122fe3367ff2f636e8ee6b1'


Trivial merge