merge of '0d12a42d751e597b06de72de2f533edced3f924b'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Thu, 13 Dec 2007 03:17:28 +0000 (03:17 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Thu, 13 Dec 2007 03:17:28 +0000 (03:17 +0000)
commitf637b5e883b11a5c5ab68758f8f75437ac8d5780
tree8744dac731e0e3593026be5cec4b3e9a9d66ff2b
parentc6c56ec9b79372e509f87a08e9d0e8e60bc854b4
parent1140c9fef8e08e49bf990b072b90888df1d17de8
Merge ... '0d12a42d751e597b06de72de2f533edced3f924b'
     and '9accc308ba3bc929c4110a7f5eebddb682eac755'