merge of 542f6b46587305352d62fe667186ce8ecb2b961f
authorRod Whitby <rod@whitby.id.au>
Fri, 2 Dec 2005 10:33:21 +0000 (10:33 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Fri, 2 Dec 2005 10:33:21 +0000 (10:33 +0000)
commitf1d97cf9af58b547348c14cf65c1e71ddb630b6b
tree2f3c2e986056af917d2870885bdcbc30f4440056
parent3ef1a5c51ba93db382fcab0d84d937fc74b79692
parentd6d48213133a34b9cea46aec56ea3324e73a0039
merge of 542f6b46587305352d62fe667186ce8ecb2b961f
     and beb867c2b9c7cc5d33068e9a46974e7650287391