merge of '3a33174c6fa66a880c209e2c329c44ccbc664a0b'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Mon, 8 Jan 2007 00:20:33 +0000 (00:20 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Mon, 8 Jan 2007 00:20:33 +0000 (00:20 +0000)
commit966b0a97638adcafe201dc5716deb5f87f41ae1c
tree8ffdbca729cba8fed70c5da77da9f402064e6b9a
parent0c09d4e105a7bafcff253d29c33a0065d7fc8cb1
parenta3ad75788ef4385dcc4ab80a8eb86a2a68ac6a45
Merge ... '3a33174c6fa66a880c209e2c329c44ccbc664a0b'
     and '9f8a39fa34d7257f597bf4ca8e99a108275f6d3f'