merge of 25db80bea462a7241e31b8a78ccf8333e59e1160
authorKoen Kooi <koen@openembedded.org>
Tue, 8 Nov 2005 16:26:43 +0000 (16:26 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Tue, 8 Nov 2005 16:26:43 +0000 (16:26 +0000)
commit57f454f55e18298ae1b32afb6f9ae74eea1c648c
treeb8c9b865dd09f1d1992098873a1a7695a5bb71ed
parent89aecb8bb608bf86eaf4bd812b3b9ce39a985968
parent50d382f5c31cbfa36ea9982088e0fe2734bee36c
merge of 25db80bea462a7241e31b8a78ccf8333e59e1160
     and e911b6055dc1d7acc7b1dea7abe6d6df87db4f8f