merge of '545fbb481fb86e841b1362914cceb6638930d7ee'
authorKoen Kooi <koen@openembedded.org>
Thu, 14 Jun 2007 08:04:02 +0000 (08:04 +0000)
committerKoen Kooi <koen@openembedded.org>
Thu, 14 Jun 2007 08:04:02 +0000 (08:04 +0000)
commit7682c0c102e0a7a0e36b7303fc1533d72a2d1407
tree9591b51b65c38f6d927e3b1121a80ca6bf0d2af5
parent84cb2a3a852b40b32e19eb04d967d7dd68e3c2b2
parentd0a22057caf834e1960b6a0abf8a807b6d82bac0
Merge ... '545fbb481fb86e841b1362914cceb6638930d7ee'
     and 'b3b0a8850deffddd2c3a43b7bc7c142279e70463'