merge of 'e383b4da996a2fc451decc374fb00f9c927e9ca1'
authorKoen Kooi <koen@openembedded.org>
Thu, 10 Aug 2006 16:17:24 +0000 (16:17 +0000)
committerKoen Kooi <koen@openembedded.org>
Thu, 10 Aug 2006 16:17:24 +0000 (16:17 +0000)
commit3015ba72d7dbd9fec52fb653614f554c8f66d029
tree02ce555e54315a4db4b7eae3ddab3a68fd086a48
parent9d80bd9902136eaf1e92ebcd646815afdf93d5c3
parent646df81c739bf416fb8ec144bc11eb555dcc0cac
Merge ... 'e383b4da996a2fc451decc374fb00f9c927e9ca1'
     and 'fdff4c7b074f0518fdc8379e6902fa4e4d984894'