merge of '17f165259b5092d4fb5def6145d429af967f491a'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Tue, 23 Oct 2007 08:24:32 +0000 (08:24 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Tue, 23 Oct 2007 08:24:32 +0000 (08:24 +0000)
commit1a4520ea937ba716904eacf196575d6f7ebe6e50
treee7a45ce6e4f4ff3b6ab4a370153eaf67baa99cce
parente2c08770724b650dc4674c3b1435568c2cd3ed3e
parent1298d6404cf24b1a441a553ebc7a104330ea3d54
Merge ... '17f165259b5092d4fb5def6145d429af967f491a'
     and '59cab1cf7e6555c78e83160548945b0b63b193a9'