merge of '47b75b678cf4bede24082e551e04f186734a008c'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Tue, 5 Feb 2008 13:34:45 +0000 (13:34 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Tue, 5 Feb 2008 13:34:45 +0000 (13:34 +0000)
commit4f349bdd5dd605248c9825c396c168f2bf5c38b6
treed6f6822815ffb67fe0f3fa5a930776b9f23c4151
parentba1f922665354b80da5e8636097cafaa7b2f91ee
parentbaaba6900900fe9815089d25270665899e2576a6
Merge ... '47b75b678cf4bede24082e551e04f186734a008c'
     and '647847c7187d536c71adab58568757d34b048ac2'