merge of '6696df101b8a0383c5cf30d534475ac1dc4d0866'
authorRolf Leggewie <oe-devel@rolf.leggewie.biz>
Thu, 8 Feb 2007 15:57:19 +0000 (15:57 +0000)
committerRolf Leggewie <oe-devel@rolf.leggewie.biz>
Thu, 8 Feb 2007 15:57:19 +0000 (15:57 +0000)
commita87bb7b9c5d5d297d869f0952b0c01288a8726ba
treefed4a7b243b746c5377d4b9ee49578681214ad13
parent46bb868f542f65434aa7c611fc655cb726ba3022
parentee509e58b15e1d33c12b426d079288ba8d339394
Merge ... '6696df101b8a0383c5cf30d534475ac1dc4d0866'
     and 'bdcb3d240662ee2deb3443ec573736ad9e723764'