merge of '355262927125dc01051bf0f6b36fc492b766c9d7'
authorKoen Kooi <koen@openembedded.org>
Mon, 31 Jul 2006 16:56:20 +0000 (16:56 +0000)
committerKoen Kooi <koen@openembedded.org>
Mon, 31 Jul 2006 16:56:20 +0000 (16:56 +0000)
     and '60557e20a6b9593541f74b8231f50e85bf385819'


Trivial merge