merge of '3eca6e20852dc85705fb05ad1be96527ff27ec27'
authorKoen Kooi <koen@openembedded.org>
Fri, 13 Oct 2006 09:42:30 +0000 (09:42 +0000)
committerKoen Kooi <koen@openembedded.org>
Fri, 13 Oct 2006 09:42:30 +0000 (09:42 +0000)
     and '442f3e4d64766f0dd94a0834278fbfb328811ecc'


Trivial merge