merge of 8724fc9ddffaee5f1d11645b843841c381bff316
authorRod Whitby <rod@whitby.id.au>
Sun, 7 Aug 2005 18:45:40 +0000 (18:45 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sun, 7 Aug 2005 18:45:40 +0000 (18:45 +0000)
     and 874bcd50b82c22dd088477970503fb656f93a7e0


Trivial merge