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)
commitb29928b022bd34c6c8e902c0b311b4b69e1d36ec
tree468b91229c77324300bb05f723d35f81f10989ea
parent0729b190f2a0e92b6a66f958803350e738cc376c
parent9e38546bebf75735da5dd957b7e4a3b54aa594ae
Merge ... 'a1ac08321d149b2fdf0a8556eee3e9606457d69c'
     and 'f8367e2de589c7255122fe3367ff2f636e8ee6b1'