merge of 'c6c228c0cd2991434c9bb9e2a46ea7de66af8962'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Thu, 30 Aug 2007 07:57:38 +0000 (07:57 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Thu, 30 Aug 2007 07:57:38 +0000 (07:57 +0000)
commitfbc6c9cf7aa6148221b817ed8e4dcf46da1f17a1
treef0b8a534c71eb7329bd29f178ca40e7c7871648f
parent3aded69ae48453e4929d42994c9f66abcb2dd47e
parent72371295243dfdfc8893ffb62f3c6e4216d98b0b
Merge ... 'c6c228c0cd2991434c9bb9e2a46ea7de66af8962'
     and 'd0ad1bdf2a54c68b55cdc43378bb68bb835cfe47'