merge of 6217b7556df1e286940ec0d23fad92ab2f91eaa3
authorRod Whitby <rod@whitby.id.au>
Mon, 5 Dec 2005 16:47:28 +0000 (16:47 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Mon, 5 Dec 2005 16:47:28 +0000 (16:47 +0000)
commit562df0bb4d206422c0e403f5223cd0416f2fadbc
treeedcd4fc8a9d358d3e102706a77b2c49feeb2cd18
parentdbefa15b8674451b9db95022a904f4dc22901f8a
parent4ae600c96567dfe5b95f89e58e7c69466ff981ae
merge of 6217b7556df1e286940ec0d23fad92ab2f91eaa3
     and 9b38a150f49864b478f6d3a1dcf6a63e6d7fa4e8