merge of '0c748e1d7bac1a47ec910c7acdb38a694ca28999'
authorKoen Kooi <koen@openembedded.org>
Sat, 11 Nov 2006 20:32:53 +0000 (20:32 +0000)
committerKoen Kooi <koen@openembedded.org>
Sat, 11 Nov 2006 20:32:53 +0000 (20:32 +0000)
     and '2514e90184801c096284ce7869e8eb95ddf3a9db'


Trivial merge