merge of 3ce424d5d8f31e0ba22a3979298d97c8a37e4f4a
authorKoen Kooi <koen@openembedded.org>
Thu, 18 May 2006 12:48:07 +0000 (12:48 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Thu, 18 May 2006 12:48:07 +0000 (12:48 +0000)
commit30ae70170fb606b4468bcad87e879e075ec90177
tree300a372d55cdd33dae15c4cbaf07fd1d1c30f634
parentb0da47558261c934bf1b0c2aeae37d872142f256
parent56d1883c3858d8df9a2e08652c5bb4562be9f603
merge of 3ce424d5d8f31e0ba22a3979298d97c8a37e4f4a
     and 8e42a3791620b4411df47a038ef0451b2fbd4432