merge of '1608fc5062abdfc7660b3e33f0ae5ce2b91f8dc1'
authorKoen Kooi <koen@openembedded.org>
Fri, 25 May 2007 07:26:02 +0000 (07:26 +0000)
committerKoen Kooi <koen@openembedded.org>
Fri, 25 May 2007 07:26:02 +0000 (07:26 +0000)
     and '26e45085fe4ed2dbc8b88365ff8996c52b3ff718'


Trivial merge