merge of '0a670ad135de80006479fae559372bd4a2a6953e'
authorKoen Kooi <koen@openembedded.org>
Thu, 21 Dec 2006 21:44:02 +0000 (21:44 +0000)
committerKoen Kooi <koen@openembedded.org>
Thu, 21 Dec 2006 21:44:02 +0000 (21:44 +0000)
     and '850dbef2977c53c7f819381ceb94ff469adaddc8'


Trivial merge