merge of '5fca8a9235857878b0071b8bbb8836022bc08a23'
authorKoen Kooi <koen@openembedded.org>
Tue, 5 Sep 2006 08:13:12 +0000 (08:13 +0000)
committerKoen Kooi <koen@openembedded.org>
Tue, 5 Sep 2006 08:13:12 +0000 (08:13 +0000)
     and 'b91a2f03f8871b81762acbcf8d524de4970ca8ec'


Trivial merge