merge of '1d5e5e75e72979319be31deaac4917c4f7140feb'
authorKoen Kooi <koen@openembedded.org>
Sun, 6 May 2007 07:31:07 +0000 (07:31 +0000)
committerKoen Kooi <koen@openembedded.org>
Sun, 6 May 2007 07:31:07 +0000 (07:31 +0000)
     and 'f4c9a51fe022025ad399daed859ad871af6b77a1'


Trivial merge