merge of '4ddff6248143a48297190b36c8ec6148bc9301bb'
authorKoen Kooi <koen@openembedded.org>
Tue, 21 Nov 2006 19:26:03 +0000 (19:26 +0000)
committerKoen Kooi <koen@openembedded.org>
Tue, 21 Nov 2006 19:26:03 +0000 (19:26 +0000)
commitd407f7c94e04244dd15c649ddc8f70fc1cd93e5d
treefdb9b5f5e58499e73c776708d291977f0ac7d072
parent90349962321d16a0671104e7452f5ab094e6e130
parent2b2de44476ac19706dadf5eae0803ebbfa706b23
Merge ... '4ddff6248143a48297190b36c8ec6148bc9301bb'
     and '596c72f81f8ea7f3dc414c89f83ba978e7c935dd'