merge of 'd4c11ccced24bf281af2ed0d7b7c4d0fdd33692a'
authorKoen Kooi <koen@openembedded.org>
Thu, 14 Sep 2006 21:24:12 +0000 (21:24 +0000)
committerKoen Kooi <koen@openembedded.org>
Thu, 14 Sep 2006 21:24:12 +0000 (21:24 +0000)
     and 'fd4f8197fc893ac473a9b7436ba5268b5e0da70d'


Trivial merge