merge of bd5f9b1ebde1d70cbb0331d6fe4e949ecb9eeb50
authorKoen Kooi <koen@openembedded.org>
Sat, 30 Jul 2005 21:02:51 +0000 (21:02 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sat, 30 Jul 2005 21:02:51 +0000 (21:02 +0000)
commitdb73bdddcba33027c35cf6f8910fa0b00e23eb96
tree50ecb4f4d7912ff781db9d68d9280479aee4a4cf
parent0f23819ddca7eb0894efb2a85f4a4f39bd48c617
parent82eca06c34e4483962439a7e363e1c299cc1c59e
merge of bd5f9b1ebde1d70cbb0331d6fe4e949ecb9eeb50
     and d5c1c82a4f4d4259c9ae9a22865774bf9df663ca