merge of 532d9ba2654dfb76ff4b9272867357a92726e966
authorKoen Kooi <koen@openembedded.org>
Fri, 1 Jul 2005 07:09:28 +0000 (07:09 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Fri, 1 Jul 2005 07:09:28 +0000 (07:09 +0000)
commit34b90225ae1d1a2e820ad2da5327c86e063603dc
tree859d7cfff45fd31d1663d68baaf256bcd326fd6a
parent2cb8bf746878e61c60e05a7ae118bfb79cf470cb
parentcba6a1de7fb242b197241f9bc6de79fe9cd777be
merge of 532d9ba2654dfb76ff4b9272867357a92726e966
     and c47283c3e0477386a1d877079a468c3bcdd19cd3