merge of '1d173acb1b7f8a2e7127fddb4716194d677d3440'
authorKoen Kooi <koen@openembedded.org>
Wed, 14 May 2008 19:39:11 +0000 (19:39 +0000)
committerKoen Kooi <koen@openembedded.org>
Wed, 14 May 2008 19:39:11 +0000 (19:39 +0000)
     and 'bd7627fcd5e0f5566f8fa82c30d1cd95e9900926'


Trivial merge