merge of '8e46af8afd28f4539d080bc3d9d977cf3f17cf75'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Thu, 3 May 2007 07:23:19 +0000 (07:23 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Thu, 3 May 2007 07:23:19 +0000 (07:23 +0000)
commitec256ea93311f711be06c6dbba3af225fab7ca9f
tree97f23e2cedb2d5dae35896a0fd20e39333311406
parentb7e65208733163510a0b1792507046b4c42153e5
parent2ad0ce50a8c83e61b7fdc1a65f63cf01cf3468e0
Merge ... '8e46af8afd28f4539d080bc3d9d977cf3f17cf75'
     and 'f93b1c50def57bdde2f3e3b2ac16d00035fadec2'