merge of '4ca8a8b2d3b5c23e0df60d228c5549695910a24b'
authorKoen Kooi <koen@openembedded.org>
Fri, 23 Nov 2007 09:46:49 +0000 (09:46 +0000)
committerKoen Kooi <koen@openembedded.org>
Fri, 23 Nov 2007 09:46:49 +0000 (09:46 +0000)
     and 'ec9b4188f1f043fd13783ea1ed8a13f349a862d8'


Trivial merge