merge of '338ea31d4809a6db514f8ee9dbd35db2c426e83f'
authorRolf Leggewie <oe-devel@rolf.leggewie.biz>
Fri, 30 Mar 2007 02:13:29 +0000 (02:13 +0000)
committerRolf Leggewie <oe-devel@rolf.leggewie.biz>
Fri, 30 Mar 2007 02:13:29 +0000 (02:13 +0000)
commitdf072e35c156fcedce2e7488efd9651f2fe6773c
treec1e00f7392d09a019c54d3aec7112ff050be7a78
parent8fc5afd475c8c2a1fd4de81937cd736c5931bb7c
parenta5ab4c711b23d99dd9d252d5c08fa60dd76c493d
Merge ... '338ea31d4809a6db514f8ee9dbd35db2c426e83f'
     and '33ef958347850ae3830b2326a4476282484717bd'