merge of '4d9368570e94fc8bc65712d1c95027d8a436eee1'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Fri, 9 May 2008 01:54:26 +0000 (01:54 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Fri, 9 May 2008 01:54:26 +0000 (01:54 +0000)
commit569a066f472d42fb8411421cbfbd1c706c49dd1c
tree5e423732aee910418694421477e554a770a82d5b
parent3453471db2dd362dbaf88008e9943f0f9ef6a8ea
parent298ab6aa962b7c2a70a2e373ee8deee880fe1ab2
Merge ... '4d9368570e94fc8bc65712d1c95027d8a436eee1'
     and '6f9a15eb9033fcc77c3985059f624c5623c9c90b'