merge of 2f4be4bda0bc32eb72174daa1ac365050b7a9d85
authorRod Whitby <rod@whitby.id.au>
Tue, 9 Aug 2005 15:02:25 +0000 (15:02 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Tue, 9 Aug 2005 15:02:25 +0000 (15:02 +0000)
commitff5e3e381f3eaa6eeffc10af9894e64ca98dea07
treea0d8344d01cc321de418907a86dd2602ce37dc4c
parent814e36a4de03f42f9c8291c2d6e68cdadcae8bae
parentbf74c6866a479a57b4c6c558bc7da42a58ea8d28
merge of 2f4be4bda0bc32eb72174daa1ac365050b7a9d85
     and 42695d2917826b4ecd949ee4cce709f6f04fc54c