merge of bd60f4037ae56c6a4b161d9de8e542983c39be3c
authorMike Westerhof <mwester@dls.net>
Thu, 25 May 2006 14:28:00 +0000 (14:28 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Thu, 25 May 2006 14:28:00 +0000 (14:28 +0000)
commit34cf420fab70b5b1a11a42c864a39bbcf8fb42d8
tree8dec908a8d3dd7197e431b5185c5c078629aa6f9
parent3665ab9635a7ebbb1012b55507fa74c966828e01
parent37fbb9165458b5912a0e676eb39d321e85f1cc79
merge of bd60f4037ae56c6a4b161d9de8e542983c39be3c
     and eaece614d6c87d764b5caab83e36659c8131f64d