merge of '3b5717e88b7dc6248a4a04b0383da3e66cb7e025'
authorKoen Kooi <koen@openembedded.org>
Thu, 10 Aug 2006 16:08:02 +0000 (16:08 +0000)
committerKoen Kooi <koen@openembedded.org>
Thu, 10 Aug 2006 16:08:02 +0000 (16:08 +0000)
     and '4b00e5d9fb0f4824f24d6a7a5ba99b8f6b40d677'


Trivial merge