merge of '2098d6e0cf6da177c9c29ab698039d0012c237cf'
authorKoen Kooi <koen@openembedded.org>
Wed, 23 Aug 2006 11:20:01 +0000 (11:20 +0000)
committerKoen Kooi <koen@openembedded.org>
Wed, 23 Aug 2006 11:20:01 +0000 (11:20 +0000)
commit74a78deba9f6f4b6f64d61b3bc54d9d347123f2d
treeda3565ce4eca1b8aaf30b9fe09e6e126bae82813
parent5ff7890de244fdadae4ff39da764356be1316d5f
parentd67a8ee9a19dc01ad9ac3a3cc3dd756d31a42696
Merge ... '2098d6e0cf6da177c9c29ab698039d0012c237cf'
     and 'ba1e4402b3fca3d076d401b99e8e14999910d0e5'