merge of '1877cd2e9cf302d7d582ad4ad0947bd3f85e2f46'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Mon, 11 Jun 2007 18:12:24 +0000 (18:12 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Mon, 11 Jun 2007 18:12:24 +0000 (18:12 +0000)
commit369e7e57d3b993bafd8db26058c45406306928c7
tree1672c145f6e2f552d9225276c322c67b84c714c0
parentd1af5e107b2eac6bbeee0d10cda998f8fae1f6ee
parent1fe2817f8e81119e4150a89595fac8e965e90f1a
Merge ... '1877cd2e9cf302d7d582ad4ad0947bd3f85e2f46'
     and 'f3fa67134fa2d552431ce94b3430e6d12f75c164'