merge of 2117dd5b726765202daffe67318297ef78df5a4f
authorRod Whitby <rod@whitby.id.au>
Thu, 14 Jul 2005 00:02:49 +0000 (00:02 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Thu, 14 Jul 2005 00:02:49 +0000 (00:02 +0000)
     and 2913dd5a4db27b7b121a13b703b88a41e73464aa


Trivial merge