merge of 'b54b6efc8251bc5fce52afcb9a74272f2cea1bbb'
authorRolf Leggewie <oe-devel@rolf.leggewie.biz>
Wed, 16 Jan 2008 14:34:35 +0000 (14:34 +0000)
committerRolf Leggewie <oe-devel@rolf.leggewie.biz>
Wed, 16 Jan 2008 14:34:35 +0000 (14:34 +0000)
commit8378be7a49b8cdb9935fdeb2594ddd00d89930e1
tree664c351ca0f6076782bbae8445ef4ff333b81093
parentb530959e3ae9765a41527963c99072b5d4f468fc
parentf0ee954dd96ad99345d8ac116a9fecf92920a9ae
Merge ... 'b54b6efc8251bc5fce52afcb9a74272f2cea1bbb'
     and 'fc51ba6c6f78e661b51a328e391e78d3fa49d2d0'