merge of 009ad2ebd87d84a529fa64970aef3233b7733d5e
authorRod Whitby <rod@whitby.id.au>
Thu, 28 Jul 2005 08:03:42 +0000 (08:03 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Thu, 28 Jul 2005 08:03:42 +0000 (08:03 +0000)
commit6121f3031da209e3568f565c3216f2923ffd705c
tree10990b0b1f5da7556a61c40efd698777af6b0bbc
parentd6f2604e2b0ef3bfd2be6c3a74234d9591ef0854
parentc3fcaf89b3479812cb05e5f5f0fedbfeac14e02c
merge of 009ad2ebd87d84a529fa64970aef3233b7733d5e
     and 0850de9cd5fce13fe0304a29f025705350f8ab6e