merge of '8ccc9ddeffbeea9f755fb4b0caf0a811f8221384'
authorKoen Kooi <koen@openembedded.org>
Wed, 23 Aug 2006 21:45:11 +0000 (21:45 +0000)
committerKoen Kooi <koen@openembedded.org>
Wed, 23 Aug 2006 21:45:11 +0000 (21:45 +0000)
     and 'c9f0e213d8e0fdc01e39c1d5ebd4f3e5de4db6b1'


Trivial merge