merge of 7c44aa4a133bc4d41a691bad6ecdc5dc886d4737
authorRod Whitby <rod@whitby.id.au>
Thu, 1 Dec 2005 16:16:45 +0000 (16:16 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Thu, 1 Dec 2005 16:16:45 +0000 (16:16 +0000)
     and d72c18a4bdb40a69e578b041fe714f31487fcb1e


Trivial merge