merge of '4b73558623bbfab1759729a3f14c435cc6b440a1'
authorKoen Kooi <koen@openembedded.org>
Mon, 9 Oct 2006 15:57:32 +0000 (15:57 +0000)
committerKoen Kooi <koen@openembedded.org>
Mon, 9 Oct 2006 15:57:32 +0000 (15:57 +0000)
     and '6a4ecd57e9c1dfc1820534343f16826f245b2a59'


Trivial merge