merge of 1f23f78bb018ef9ead8f831e7653c095cbe8c3ae
authorRod Whitby <rod@whitby.id.au>
Wed, 8 Feb 2006 19:20:06 +0000 (19:20 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Wed, 8 Feb 2006 19:20:06 +0000 (19:20 +0000)
commita11765c6d7508a96a2974b6be41c47f2124b0267
treec27a7acd585ab459c992b99fe4af4a51a1fc2935
parentb443863746b74b37f20dffa81a0b7c7af91b51d7
parent457cf361541c3ef84d1b539fcc1ff48b76f274a8
merge of 1f23f78bb018ef9ead8f831e7653c095cbe8c3ae
     and b567e2cc931d36f704f32c2c731b800fa6b83a18