merge of '0d5d329305f1889da24316c8f1a1c4055aa1c965'
authorKoen Kooi <koen@openembedded.org>
Fri, 11 Aug 2006 18:38:10 +0000 (18:38 +0000)
committerKoen Kooi <koen@openembedded.org>
Fri, 11 Aug 2006 18:38:10 +0000 (18:38 +0000)
commitcf0084145f0d0dc19f26960f4c7b2c22760d0027
tree5486247969bd6e5076b943a70519695ace3fe545
parent43669de0bd8dafe0e77b73b086bb381dde2fd130
parent793088bf35cab68f4ad12a700f596359505d0ea5
Merge ... '0d5d329305f1889da24316c8f1a1c4055aa1c965'
     and 'a064ac2b5db052cbadae6856a18d5be4dd8ef6e9'