merge of '26ec78f4f59453ecd4343ab4c92d4787ab5a81fe'
authorKoen Kooi <koen@openembedded.org>
Fri, 8 Aug 2008 13:05:14 +0000 (13:05 +0000)
committerKoen Kooi <koen@openembedded.org>
Fri, 8 Aug 2008 13:05:14 +0000 (13:05 +0000)
commit69990468b9e9828532b42e15896c671d246fe764
treef1c5310ef02b5aa814f29144257f8a1c19c94df1
parente0e06499ca566922181234ab2f4698d4024f7f64
parent839acf519ef0d68d6b253a24556d0fb7ed02835d
Merge ... '26ec78f4f59453ecd4343ab4c92d4787ab5a81fe'
     and '33f3d0a7c4cbdff4e2348d37b7add06e6c261f0e'