merge of 445191ac8aa50c61b1a86a6ed50f98515cfe4502
authorKoen Kooi <koen@openembedded.org>
Fri, 2 Sep 2005 13:25:22 +0000 (13:25 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Fri, 2 Sep 2005 13:25:22 +0000 (13:25 +0000)
commit1d39b2a5f78571e8a68cce6434773e84b4cffee5
tree2f2365027a4e0aa1e737a2df133b39ee984b57dc
parent811e1f471b6b66bd134c387b5376b00b3bebb739
parentbee7a25ddc345dc94b9de4e0975d949f1c35bdff
merge of 445191ac8aa50c61b1a86a6ed50f98515cfe4502
     and 8ea4e34f565a6ef515ff201e69997d656976d488