merge of 059ddb966f180b6beb2753809aff0ad72104f0cb
authorRod Whitby <rod@whitby.id.au>
Wed, 17 Aug 2005 22:36:44 +0000 (22:36 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Wed, 17 Aug 2005 22:36:44 +0000 (22:36 +0000)
commit21c74a4b3f0aa949e0aabae7dd2c62682967dc07
tree9ec5f73e835e7b39d92807d935e7f96ec25c2aa2
parente3c6bbaf268d45fdbd078d98ef1ed38c09392b0b
parenta4a96b8d97c46d54bca58627b5f4d2ed42b7f802
merge of 059ddb966f180b6beb2753809aff0ad72104f0cb
     and 90c2bc8ff57631e741bed8fa66cdfaecd2a75077