merge of 8b577ca08ab7b7fb1fc1a3b476b2d58fe81e6f4c
authorKoen Kooi <koen@openembedded.org>
Mon, 13 Feb 2006 22:05:28 +0000 (22:05 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Mon, 13 Feb 2006 22:05:28 +0000 (22:05 +0000)
     and 9458ed3aa4bbe3e16ee79a7fac2569e5d515e305


Trivial merge