merge of 0301ca2b29fe2554d791cb230b33104946f9d50b
authorRod Whitby <rod@whitby.id.au>
Sat, 22 Oct 2005 18:38:51 +0000 (18:38 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sat, 22 Oct 2005 18:38:51 +0000 (18:38 +0000)
commit0eeba2217db989370fddf7a3b710303f7e755eed
tree9f49ef7c3696a59a5aa960580446bc2b29174706
parentc950bb947149344ba5cde64507c9f2164d7c0e9a
parent2cd7015e3f02f124247fd2bdd06fd3c3a9447d13
merge of 0301ca2b29fe2554d791cb230b33104946f9d50b
     and 435eda25fcea43b6f5ea1c355dee46e99dcecf85