merge of '4ddff6248143a48297190b36c8ec6148bc9301bb'
authorKoen Kooi <koen@openembedded.org>
Tue, 21 Nov 2006 19:26:03 +0000 (19:26 +0000)
committerKoen Kooi <koen@openembedded.org>
Tue, 21 Nov 2006 19:26:03 +0000 (19:26 +0000)
     and '596c72f81f8ea7f3dc414c89f83ba978e7c935dd'


Trivial merge