merge of '15b6f45301fda6f790437001f9294ee5c0aa8b0b'
authorKoen Kooi <koen@openembedded.org>
Tue, 28 Nov 2006 20:42:51 +0000 (20:42 +0000)
committerKoen Kooi <koen@openembedded.org>
Tue, 28 Nov 2006 20:42:51 +0000 (20:42 +0000)
     and '229401407cd5205eaf63199ff76bf8ec83129101'


Trivial merge