merge of ce6f9ade2d3d21323b745d20061888943279bb6a
authorRod Whitby <rod@whitby.id.au>
Thu, 28 Jul 2005 07:50:48 +0000 (07:50 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Thu, 28 Jul 2005 07:50:48 +0000 (07:50 +0000)
     and f32d41db382da524a07b89fc5a7564293330eef4


Trivial merge