merge of '90351b745d224f3df5a0fd1defc219452b21a55b'
authorKoen Kooi <koen@openembedded.org>
Thu, 22 Mar 2007 07:57:36 +0000 (07:57 +0000)
committerKoen Kooi <koen@openembedded.org>
Thu, 22 Mar 2007 07:57:36 +0000 (07:57 +0000)
commit56454708e15fb4f99265f80c9494de76955b750e
treeb9fb85e9c3b653c8b2de260b3d0312399ec6f95d
parent6f9573c3645cbd28e592d50f255861d4d3468b54
parent09c298cf5a0e286d9a8630445d215680b455d95c
Merge ... '90351b745d224f3df5a0fd1defc219452b21a55b'
     and 'd0c48feb35f1f108e69054172cfc68954b2cee1d'