merge of 37a520a39f5f3affca5295dece5c847608f29174
authorKoen Kooi <koen@openembedded.org>
Thu, 9 Feb 2006 16:51:21 +0000 (16:51 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Thu, 9 Feb 2006 16:51:21 +0000 (16:51 +0000)
     and ec9469056d43dac6d0e66ed19704b0fe7fb37cee


Trivial merge