merge of 69a16876f0ffb0c103caef0590521a09a27ea04f
authorRod Whitby <rod@whitby.id.au>
Fri, 13 Jan 2006 17:05:32 +0000 (17:05 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Fri, 13 Jan 2006 17:05:32 +0000 (17:05 +0000)
commit73472a720088f0d9d8703593d20b5f22dda8f17f
tree9292f48e9ce4352cf33bcad1edd3ab4e26a19f79
parent5628d5b68310df4552e2bb149097873c159143c8
parente6b9740c0ee3c08fabd2fd8b8a6807bdb75ab1c1
merge of 69a16876f0ffb0c103caef0590521a09a27ea04f
     and 727e147b943bf50bd25b6a42f0d8d51dfd7ba82e