merge of '3b3bdcaa9ad2328f02f412cfd58e88c216486d47'
authorKoen Kooi <koen@openembedded.org>
Thu, 20 Mar 2008 12:34:27 +0000 (12:34 +0000)
committerKoen Kooi <koen@openembedded.org>
Thu, 20 Mar 2008 12:34:27 +0000 (12:34 +0000)
     and '808c0f3bcbe784d70daee61bfb6f464d0072147f'


Trivial merge