merge of '378deeb40b41ec05cc902c4d69546d9f2f604c30'
authorRolf Leggewie <oe-devel@rolf.leggewie.biz>
Tue, 29 May 2007 00:44:53 +0000 (00:44 +0000)
committerRolf Leggewie <oe-devel@rolf.leggewie.biz>
Tue, 29 May 2007 00:44:53 +0000 (00:44 +0000)
commit81cc4382a3bf649612302e67189118ebaa8ae810
treee94c15a3ca67650756bf7030e30818364138b043
parentd3e661042f818b9cd813ba54b9e6a978fa66c896
parent65ca94305467d91768c6c0ff76cb62519dc1e191
Merge ... '378deeb40b41ec05cc902c4d69546d9f2f604c30'
     and 'abe0bb682ca88dfb40542ab379b6c2af2e84d1b4'