merge of 'a6f1d179d5b142243bfd53363872c06f4207c8da'
authorKoen Kooi <koen@openembedded.org>
Thu, 19 Oct 2006 11:38:08 +0000 (11:38 +0000)
committerKoen Kooi <koen@openembedded.org>
Thu, 19 Oct 2006 11:38:08 +0000 (11:38 +0000)
commit3dab540228d7c6a944252d6dfd3223e0eea40029
tree1b89e92bdef2240ce69c65cbba5b5eab02c31b41
parenta042bad7ce85d30d49f2eb24b25e6164cd92eaa2
parentecf100cafb5b49bb48c87fab754d3436aab70de0
Merge ... 'a6f1d179d5b142243bfd53363872c06f4207c8da'
     and 'ccbf52e8ded1b509f617e8d8e81fd0b4045bcff7'