merge of aa1a8be266cc5dcd001ac773999d164f125b29a2
authorRod Whitby <rod@whitby.id.au>
Tue, 2 Aug 2005 00:31:12 +0000 (00:31 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Tue, 2 Aug 2005 00:31:12 +0000 (00:31 +0000)
     and d5ca2d9089d0a71c3f006b3ef5b5a276d383f1c1


Trivial merge