merge of '24d82a2b5a32fe5d1e0f3aa0049aaa50eb5ba7bc'
authorRolf Leggewie <oe-devel@rolf.leggewie.biz>
Wed, 7 Feb 2007 12:05:17 +0000 (12:05 +0000)
committerRolf Leggewie <oe-devel@rolf.leggewie.biz>
Wed, 7 Feb 2007 12:05:17 +0000 (12:05 +0000)
commite8812006ed648326c1f6adb4f4df35f08ce6c89e
treecb2c229e2ac1ed80f7a529886a24cea4264f568d
parentf9f37c0798f2227c11758c60f21ecc0672c6b596
parentb044b304bb97f2875654528e13fdaf0d1ad10fcf
Merge ... '24d82a2b5a32fe5d1e0f3aa0049aaa50eb5ba7bc'
     and 'bd59bf132405beb76e4a22fc2430ec43c7a0f26e'