merge of 'c0e1d74b2a331789caaf72b458b57924d21c7da3'
authorKoen Kooi <koen@openembedded.org>
Tue, 2 Jan 2007 00:06:07 +0000 (00:06 +0000)
committerKoen Kooi <koen@openembedded.org>
Tue, 2 Jan 2007 00:06:07 +0000 (00:06 +0000)
     and 'cc1b4154bcb4fcf73ff9107d9423b76123ad5528'


Trivial merge