merge of '101eec5076cbe6de0504b5ce78498024e3c16e03'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Tue, 15 Apr 2008 14:04:37 +0000 (14:04 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Tue, 15 Apr 2008 14:04:37 +0000 (14:04 +0000)
commit0af187780864b83e5ec107f10a9d8f4c4bd33af0
tree3a42c510b5c391c9201325629ae4c43a577299b3
parent0a8b86b9085d11314b170d5d40b0715a8ef3d3eb
parent5acbd244f1d2123346fede058e7bd524e7bd6454
Merge ... '101eec5076cbe6de0504b5ce78498024e3c16e03'
     and '53534b02ad19a4d9ac608eedde7747fa84f7f8fc'