merge of '6466dc79dded8ec3ade8c212b27f84f9699f48e1'
authorKoen Kooi <koen@openembedded.org>
Tue, 6 Mar 2007 10:24:58 +0000 (10:24 +0000)
committerKoen Kooi <koen@openembedded.org>
Tue, 6 Mar 2007 10:24:58 +0000 (10:24 +0000)
     and '692c2b51db3e49bf51daec9a4656898cf8994fff'


Trivial merge