merge of 2aabdd81a27bbf17ccee6c78a6e49d74e5a9719f
authorKoen Kooi <koen@openembedded.org>
Thu, 10 Nov 2005 13:43:20 +0000 (13:43 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Thu, 10 Nov 2005 13:43:20 +0000 (13:43 +0000)
commitfa96cbd76be8b084d7fef1c976dc48dc97d2ca77
treef332137e54993506fbfc294e0ce220b5f20773fe
parent8a684f00811f4b42b527db0d3b78a15b64f61873
parent840957918e8bc5ba84904b876daefde836a53c69
merge of 2aabdd81a27bbf17ccee6c78a6e49d74e5a9719f
     and ad628b53bae19dc9cca0f00722bde77ec3e339b4