merge of 4d61b91c4301e551e3af7c94c94703dd49b8a5c3
authorKoen Kooi <koen@openembedded.org>
Mon, 5 Sep 2005 15:31:15 +0000 (15:31 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Mon, 5 Sep 2005 15:31:15 +0000 (15:31 +0000)
     and a9ca95824a4fece974acb09126b3dc72162d45c0


Trivial merge