merge of '66da92b8617b2b12ed4b88764898faf67c060098'
authorRolf Leggewie <oe-devel@rolf.leggewie.biz>
Sat, 9 Jun 2007 00:33:04 +0000 (00:33 +0000)
committerRolf Leggewie <oe-devel@rolf.leggewie.biz>
Sat, 9 Jun 2007 00:33:04 +0000 (00:33 +0000)
commit1aa563b9801083d0774c22f552bb33fb7c141fc8
treee74754368b9fc75a8647b8fc43fd8178d5ede75e
parent9b0e00437a696224900ed6bdb42195120f25a5af
parent300ae16f722b26be61d064ddc2c02d6b48012ff6
Merge ... '66da92b8617b2b12ed4b88764898faf67c060098'
     and 'ffb800106daf409e2cc662fcf7e757d10a3c9843'