merge of '3dbb1098a936a64f470f96db6fb6810f8b872d3b'
authorKoen Kooi <koen@openembedded.org>
Thu, 21 Dec 2006 17:35:10 +0000 (17:35 +0000)
committerKoen Kooi <koen@openembedded.org>
Thu, 21 Dec 2006 17:35:10 +0000 (17:35 +0000)
commit9f749a2afa6cc3a600eab31fa10176740c9b0690
treec40eefd866da355739355c99e99198d69adf79b5
parentc11d5f53a075464c9902a3c821665a6047b6e7e1
parent9a945e873e73ba51934f0618900c5000d56806e6
Merge ... '3dbb1098a936a64f470f96db6fb6810f8b872d3b'
     and 'a083f4b0be32b70cc5c23132ddad82240c468721'