merge of '7db6bb945fe2a5fda8aa63a3f14cb88e4f63c7ce'
authorKoen Kooi <koen@openembedded.org>
Sat, 2 Dec 2006 12:24:54 +0000 (12:24 +0000)
committerKoen Kooi <koen@openembedded.org>
Sat, 2 Dec 2006 12:24:54 +0000 (12:24 +0000)
     and 'bf07ce72438537e1e952e551bf4bfba3877e3c59'


Trivial merge