merge of '322ea19f98c9c37886c8eb080fbd9c6a552f7b1d'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Mon, 28 Apr 2008 19:01:32 +0000 (19:01 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Mon, 28 Apr 2008 19:01:32 +0000 (19:01 +0000)
commit5a51f37cecd6640ef544a8b511d444ee9afb1e34
treeef8052b5c55a92e29468f9888ebacd1298430deb
parent0ab106f1f08f87203e7bcdb1ec896d1e62a65416
parent36b64099ff67b193c65de69009ae054a32790aff
Merge ... '322ea19f98c9c37886c8eb080fbd9c6a552f7b1d'
     and 'bbaee78aa2be4934e6fb2377a1ef53589b7e3b7c'