merge of '07c919d18fca5a836fd51fcd05e0c09e6a9482e0'
authorKoen Kooi <koen@openembedded.org>
Thu, 29 Mar 2007 15:58:12 +0000 (15:58 +0000)
committerKoen Kooi <koen@openembedded.org>
Thu, 29 Mar 2007 15:58:12 +0000 (15:58 +0000)
     and 'a1ea6d789a1f6e3cf92b2e5ce75c98162525ea4f'


Trivial merge