merge of 643f20dce93bd762af1d4851da51ff1a73427476
authorRod Whitby <rod@whitby.id.au>
Mon, 5 Dec 2005 18:49:59 +0000 (18:49 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Mon, 5 Dec 2005 18:49:59 +0000 (18:49 +0000)
commitdb9099806c46c4fc4be11d0a038a8015dc6ccffa
treefbd6b2d82f72f2091103367ea4f2a1c0d6e82774
parent386066aa42d543e3916be0bebcf5ff38efda5400
parentbf17c3a64782ea292f63b3662a409365804dfeb7
merge of 643f20dce93bd762af1d4851da51ff1a73427476
     and 8d84c2b7d68f0db4213acc29ad871140c3dadfd2