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)
commiteaca434fff6601f976edc7ff0e2f75ee45fc619a
treeef8ed1e05214b64c23936aedaec28b3f8fe92e5b
parent462885aa9e50570c7b42a222b509662a2c6bba68
parent29a0fc4e612029fa329585ba179f0a07bebc5fd1
merge of 7c44aa4a133bc4d41a691bad6ecdc5dc886d4737
     and d72c18a4bdb40a69e578b041fe714f31487fcb1e