merge of 9ec15bcfc4d260277ec3a62af4079f3fccba496f
authorRod Whitby <rod@whitby.id.au>
Sat, 30 Jul 2005 16:25:28 +0000 (16:25 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sat, 30 Jul 2005 16:25:28 +0000 (16:25 +0000)
commit75ebaa5853aae420c9c281c126aaa70c0e1190b4
tree318eedf5b96dc47e849708e59fdcbaa5138cb7ed
parent1d6ca3cf720fa476e5c0afd014a33320710ba728
parentfb6dd19b9777a34ef6a3fee954d80a5485b12ef1
merge of 9ec15bcfc4d260277ec3a62af4079f3fccba496f
     and b1ad57ce7e9bdcbffb51efed051a46a0435d5999