merge of '344877dac1be60d7f6d718179f6d015c047ad23e'
authorKoen Kooi <koen@openembedded.org>
Fri, 16 May 2008 18:43:25 +0000 (18:43 +0000)
committerKoen Kooi <koen@openembedded.org>
Fri, 16 May 2008 18:43:25 +0000 (18:43 +0000)
     and 'e293c46f8f09b6eaa2999aeb6d575e1b84e6c7b4'


Trivial merge