merge of '0875295cfaf1e52bac06fb1893be0b5b76fa21ee'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sat, 28 Jul 2007 18:30:01 +0000 (18:30 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sat, 28 Jul 2007 18:30:01 +0000 (18:30 +0000)
commit9a337765328ec21356f9715df149f9308369691f
treeafc269273380b9cd9323713d0f6b6540f924048b
parentd680ed85f091e4d1d2c9e8cecfc4a5970a4747df
parent0a9f9fd784650d804b67c1f4c433f229741e9b6c
Merge ... '0875295cfaf1e52bac06fb1893be0b5b76fa21ee'
     and 'b3780b3bcc2d7109f1194e36e18555a331e2d8ec'