merge of '17c261d19b8358762e0eb5cbbc9a4cc29c9e63bc'
authorKoen Kooi <koen@openembedded.org>
Thu, 7 Dec 2006 12:52:33 +0000 (12:52 +0000)
committerKoen Kooi <koen@openembedded.org>
Thu, 7 Dec 2006 12:52:33 +0000 (12:52 +0000)
     and '7c038075995ee701b14136f3a37c2f0635040891'


Trivial merge