merge of '045e00ff4301aa05fddab174a3ac5bf9c260343b'
authorKoen Kooi <koen@openembedded.org>
Wed, 27 Aug 2008 13:19:23 +0000 (13:19 +0000)
committerKoen Kooi <koen@openembedded.org>
Wed, 27 Aug 2008 13:19:23 +0000 (13:19 +0000)
commitf05854e89327463f009e47cad7ed61bd228fb7e9
treefd3845884e99c60f5edfcb26a285140ed8ecdb7f
parentc2fc7eb12afe4faf1da04594bc81fe9e06cbc09c
parentd7a0e9f753ce162fcaf16779487d6307753106bb
Merge ... '045e00ff4301aa05fddab174a3ac5bf9c260343b'
     and '90204f8950d2ea5d6cc182ba36902a2e41bdfc7e'