merge of 0b0c66f0bd98363eff174839d98a20f34bc0e832
authorRod Whitby <rod@whitby.id.au>
Sat, 7 Jan 2006 09:00:39 +0000 (09:00 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sat, 7 Jan 2006 09:00:39 +0000 (09:00 +0000)
commit1fbdad585b0137cecf62a86a6dac7e91a44505a6
treebcfb9aa72521dc20e0fe9b1f6e05fd1679de71fd
parent8ace4d2e915c4cefe056b8efb08c94c2d7457cdc
parentd8299555e9d8ad594ec7d3fec6e8ad48fbf4b6ca
merge of 0b0c66f0bd98363eff174839d98a20f34bc0e832
     and c98db1adfa0a8714be1a5b9b7d8e8d86530e84de