merge of 31c5baa26e5b5993142fafde34198358342c9a30
authorKoen Kooi <koen@openembedded.org>
Thu, 23 Mar 2006 09:38:01 +0000 (09:38 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Thu, 23 Mar 2006 09:38:01 +0000 (09:38 +0000)
commitb4d5283ac5eda8be3429f6d6e89d258ea351cf61
treef491328608efac805b00cde8907b4dcb3904c102
parent652f0c18d80b75667bd9011d4994b86b61b888d2
parent13b2edb6894c72607e08d389aaf2a397f8ec2b93
merge of 31c5baa26e5b5993142fafde34198358342c9a30
     and 58fe56d49f6ab653044effe79a8f3e8bdea58e4a