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)
commitce09099588da37235a4652f4014794b4bde51188
treea17eb2f1bed2116e56bb1e3214f7b8b1cc39c6e5
parent7d91312121b91165cc2f06274b9530508b375a10
parent1d3831c1bfcac4dbca2d500fbcc99ed6b9a3393e
Merge ... '3b3bdcaa9ad2328f02f412cfd58e88c216486d47'
     and '808c0f3bcbe784d70daee61bfb6f464d0072147f'