merge of 86a447fd0f337e15aaf4a48806a2b49968398915
authorFlorian Boor <florian.boor@kernelconcepts.de>
Tue, 24 Jan 2006 16:43:59 +0000 (16:43 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Tue, 24 Jan 2006 16:43:59 +0000 (16:43 +0000)
commita3bfe2c3af2d8d6ab64b5d815f2e33b3b455bbaf
tree631c43cdc6d013527a4e853652e12f5bd24c6d9c
parent6c595e4140deee3df75a0966d526523f80188391
parentd1778efb8d5e433c8a2d703845d29c56b73f16e8
merge of 86a447fd0f337e15aaf4a48806a2b49968398915
     and 8fb93f5436990ed75cc95bd943b940ebdc9ae323