merge of adb05dcda79a04e8d0e9cb1eb7976a9fa2c3d31e
authorRod Whitby <rod@whitby.id.au>
Mon, 5 Dec 2005 13:52:56 +0000 (13:52 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Mon, 5 Dec 2005 13:52:56 +0000 (13:52 +0000)
commit56e3cfd5bc911e4e47ae00c8bafb785d48b0b7c5
treedbcf26ae9f2bcc533f3b55121ec7d321378abca9
parent67a233ecaa6ac6f117f7792429b489f806b320b3
parent77c2adc046dcb2841bffa98a8a5474db8441f7ae
merge of adb05dcda79a04e8d0e9cb1eb7976a9fa2c3d31e
     and d510fe2c093aff12bc3223326057244c800701ad