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)
     and 'd9d41f4703c2c7b8cf2dfa2c496bc9a5597f0452'


Trivial merge