merge of '66db83630ba1bf253d3e2c23e104ba40c0836d50'
authorKoen Kooi <koen@openembedded.org>
Thu, 15 Feb 2007 08:01:49 +0000 (08:01 +0000)
committerKoen Kooi <koen@openembedded.org>
Thu, 15 Feb 2007 08:01:49 +0000 (08:01 +0000)
     and 'c2de20613cc1dd7b1ae71b370f12d3dcd41d3b7e'


Trivial merge