merge of 1fd96e7d233a7113f1bee08df16d96bcff4340b1
authorFlorian Boor <florian.boor@kernelconcepts.de>
Wed, 18 Jan 2006 11:00:20 +0000 (11:00 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Wed, 18 Jan 2006 11:00:20 +0000 (11:00 +0000)
commit1cff8772528f5bf97ac732a157b9daf63feab5c2
tree86c3681ec7441dd69bda28c270f24a85d2df9ec8
parent0671fc09447f5fc246198cacd44c30f74e3fec89
parent3d3c02597e3e07fa1150ed6117f1134fc93784bf
merge of 1fd96e7d233a7113f1bee08df16d96bcff4340b1
     and b4a513218154eb17b59ed896ac7e0037ab11fc14