merge of '198a1c8502da246aeea1c3db2cd3085a2722f68c'
authorKoen Kooi <koen@openembedded.org>
Sat, 6 Jan 2007 14:19:34 +0000 (14:19 +0000)
committerKoen Kooi <koen@openembedded.org>
Sat, 6 Jan 2007 14:19:34 +0000 (14:19 +0000)
     and '809713f0b5b1318f67dcabcdf56c11ff54d37604'


Trivial merge