merge of '0e2728379c2e900b805d816523cedae63a8ec8e8'
authorRolf Leggewie <oe-devel@rolf.leggewie.biz>
Fri, 18 May 2007 21:56:09 +0000 (21:56 +0000)
committerRolf Leggewie <oe-devel@rolf.leggewie.biz>
Fri, 18 May 2007 21:56:09 +0000 (21:56 +0000)
commit3c3eaab8547f2d06f66b9185b2a6cb759aa6695f
treee722d76ae0b68960422c2af52597c7c1e4656eed
parentd48cbdadd7ee8410170bf08275a2600d31d404f1
parent860acaa07277881258b8457d58c3af2fcc985e54
Merge ... '0e2728379c2e900b805d816523cedae63a8ec8e8'
     and '4df275d191d23de3095b0443f1ab454afcc2a153'