merge of 'bfd03d53df75d483ec5af8f6299ec49daf006094'
authorKoen Kooi <koen@openembedded.org>
Mon, 3 Mar 2008 14:15:13 +0000 (14:15 +0000)
committerKoen Kooi <koen@openembedded.org>
Mon, 3 Mar 2008 14:15:13 +0000 (14:15 +0000)
commit6513124634a62902dd2e66029dbaf04a4cf14fe6
treeb5d62812a3368eb26060c9608bd5de9fcdaeb548
parent4c3719737a421744bd7fa84f91e89392255f441f
parent2585b92eee7b07381c45cc8fcb37eb2440663bda
Merge ... 'bfd03d53df75d483ec5af8f6299ec49daf006094'
     and 'd9d41f4703c2c7b8cf2dfa2c496bc9a5597f0452'