merge of '015d8066795c710542be78b0d248e74face7af15'
authorKoen Kooi <koen@openembedded.org>
Tue, 17 Oct 2006 11:18:41 +0000 (11:18 +0000)
committerKoen Kooi <koen@openembedded.org>
Tue, 17 Oct 2006 11:18:41 +0000 (11:18 +0000)
     and 'c745578220f213ec22c9b7cc2d6a413b1c32f4e0'


Trivial merge