merge of '8f6b66511e35bbf7f98fd72d6d67545037684189'
authorKoen Kooi <koen@openembedded.org>
Wed, 28 Feb 2007 19:15:56 +0000 (19:15 +0000)
committerKoen Kooi <koen@openembedded.org>
Wed, 28 Feb 2007 19:15:56 +0000 (19:15 +0000)
     and 'ff5998e440b2ce8a6f42769e187a556120142af8'


Trivial merge