merge of 'b802ffe5a3ad259c0df31c26d3801fe6bf2dd1fe'
authorRolf Leggewie <oe-devel@rolf.leggewie.biz>
Mon, 22 Jan 2007 22:28:18 +0000 (22:28 +0000)
committerRolf Leggewie <oe-devel@rolf.leggewie.biz>
Mon, 22 Jan 2007 22:28:18 +0000 (22:28 +0000)
commit38d7089c99d4ef83c3bda03955c85cefd39a5bd1
tree48b359bc32712f98baa00e8515ebdbae453f5434
parent59eef48f549db256895ce0c50a205513feaa08d7
parenta728223abb0150d55dcd0831001c815c20dfa642
Merge ... 'b802ffe5a3ad259c0df31c26d3801fe6bf2dd1fe'
     and 'cf72726f6215462575ee79ca4d8b07a3c682eb02'