merge of '3620da360f4c3047638547a32ec53f597dc16e88'
authorKoen Kooi <koen@openembedded.org>
Sat, 1 Sep 2007 20:17:50 +0000 (20:17 +0000)
committerKoen Kooi <koen@openembedded.org>
Sat, 1 Sep 2007 20:17:50 +0000 (20:17 +0000)
commit0fb9d535ac44eb3c51691a5c121879e8f3089328
treef8be26034a1a0dd7445fa02fe769ceef138e0bf8
parente4d7738fbc91777724b46be25d401c08ad31d9c1
parent0d0faa85ce111bc32bfa0e8685227db046ad85df
Merge ... '3620da360f4c3047638547a32ec53f597dc16e88'
     and '9bb287f6e7dc270c87e574dd4fceb90b60a065e0'