merge of 006ff5c889f07b22718fa73951084ab94aba16aa
authorJamie Lenehan <lenehan@twibble.org>
Fri, 23 Jun 2006 01:06:26 +0000 (01:06 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Fri, 23 Jun 2006 01:06:26 +0000 (01:06 +0000)
commit2854340a2866bf2b4825b802960d8cb05912ca56
tree847d9832e2f8fcb878e60514294dfba1cb944bf5
parent62ddbf75d8b7137845fde7f269b73d30f1739781
parenta59cad32e7a26cf2a0cd4d2bc99280347938a647
merge of 006ff5c889f07b22718fa73951084ab94aba16aa
     and 1526da957aace3f1e2502307c4d8877090168c67