merge of 2b1505a49c1d0539fe1fd18e82311947011facb7
authorRod Whitby <rod@whitby.id.au>
Sat, 5 Nov 2005 21:33:43 +0000 (21:33 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sat, 5 Nov 2005 21:33:43 +0000 (21:33 +0000)
commit879670377c7d5626b4f52d9f6d420ba3ceafb770
tree8668c28a180ca7b335e1e4b7ff75668689d240c2
parent8ded8dd5145a8f90bc37e5d638a19c3b58786813
parent68fe6baf4ad1280df3fcae4b5965a271e8247b41
merge of 2b1505a49c1d0539fe1fd18e82311947011facb7
     and f7112800b1c3c07c41c1b8bc8840029091ce846c