merge of 796b997254855ff420d682f8dc76e72efcae336f
authorRod Whitby <rod@whitby.id.au>
Sat, 3 Sep 2005 14:07:04 +0000 (14:07 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sat, 3 Sep 2005 14:07:04 +0000 (14:07 +0000)
commit0a1660cfb2225bbf4567b2322164ed89d029f975
treed7e203e7f32ac3cb5ecf3bc8fcfb027c1a9b61e1
parentb3c2bf33c4cbbd238033404b5a443a068e1e4d68
parent19a7b5450a58a870ea2fbe1a202d2a450969914d
merge of 796b997254855ff420d682f8dc76e72efcae336f
     and ec654721498c715927f9b99127a77f4843f52adc