merge of '80203f8e0e1f0ca5359560cbebadc073a4aa239c'
authorKoen Kooi <koen@openembedded.org>
Sat, 28 Oct 2006 16:43:13 +0000 (16:43 +0000)
committerKoen Kooi <koen@openembedded.org>
Sat, 28 Oct 2006 16:43:13 +0000 (16:43 +0000)
     and '8605cce0c3f57ef0a8d2c41260b71d2e06273548'


Trivial merge