merge of '971d18af52c7881e09c9f5ffa43d9bf33216ce83'
authorRolf Leggewie <oe-devel@rolf.leggewie.biz>
Mon, 19 Feb 2007 07:17:29 +0000 (07:17 +0000)
committerRolf Leggewie <oe-devel@rolf.leggewie.biz>
Mon, 19 Feb 2007 07:17:29 +0000 (07:17 +0000)
commit7eb910e2177cfb1e185df53c68eb41f439cf9bc2
treee94af8bbb64fc8d6463c383bd082b210fef6b400
parentb180ca49a40d9d0b2eca1efb20b965c40c6f729b
parentf5bdd34e306db20fe744dbf9634e297afa8a3480
Merge ... '971d18af52c7881e09c9f5ffa43d9bf33216ce83'
     and 'cc76392ac5a7b1ccde5981fd2e02094b88a5240a'