merge of '4d464c3102b9fdf9ec7f31a9771f62b336967b65'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sun, 25 Feb 2007 12:10:01 +0000 (12:10 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sun, 25 Feb 2007 12:10:01 +0000 (12:10 +0000)
commitcee1697942ab9b42557056d771ec2cfb7c81b523
tree11bede56f484dec92c75c6be78394ee37ee86443
parent3c3f98545132872ce178488794a4984c3c611890
parent42616023e9a94e37d2fd5c6330ffbad089927b00
Merge ... '4d464c3102b9fdf9ec7f31a9771f62b336967b65'
     and 'b8eb30a0fd93f61ff386bac7e2203fb3c883e888'