merge of '175617edcda6a7db0736cb199971e613308f4f28'
commit1db500ac9404baa415db03e60e32a67226e8342c
author <mickeyl@openembedded.org> <>
Thu, 15 May 2008 21:22:00 +0000 (15 21:22 +0000)
committer <mickeyl@openembedded.org> <>
Thu, 15 May 2008 21:22:00 +0000 (15 21:22 +0000)
tree35d54c8805e27a435174f90a20a4ce01aa9e91c0
parentc058bd1510522c4f20e3eaec9c4c556c8c6e4bc5
parent2014f82da665af006ae3dce096590754c26b0fd2
Merge ... '175617edcda6a7db0736cb199971e613308f4f28'
     and 'e53a5cd6a7325c8cfa3079fff6e7e086127f125c'