merge of 6c8af3e5626e2962745d40f48121c1f325288cda
authorKoen Kooi <koen@openembedded.org>
Tue, 27 Jun 2006 10:22:56 +0000 (10:22 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Tue, 27 Jun 2006 10:22:56 +0000 (10:22 +0000)
commitcb11932e449e33336708e77b615817a21325e812
tree45fb993f769a336a65b5fcf412c3da8e4535f549
parentb0dcd1651f7af41900aa976eb078245055ee6079
parent7967d37c60240815a08a9ad7a3c2bcd8f84ecce5
merge of 6c8af3e5626e2962745d40f48121c1f325288cda
     and d5cd44e4415b52831c79b2b82d546c0ba8c24528