merge of 'a169800c21f9c42630c25ab09b4da7ca73dac614'
authorMarcin Juszkiewicz <hrw@openembedded.org>
Thu, 29 Mar 2007 14:17:01 +0000 (14:17 +0000)
committerMarcin Juszkiewicz <hrw@openembedded.org>
Thu, 29 Mar 2007 14:17:01 +0000 (14:17 +0000)
commit36d9a4f1fa39a94b5832c2569547dd3bd5106cf2
tree4793de80ddc4a4f87bae84885e8babccc5a5a527
parent48bb4a727af559b6174c090ab89a958bff80cb42
parent0b25d92b900c10d66740b5cd37d000d2fcafc356
Merge ... 'a169800c21f9c42630c25ab09b4da7ca73dac614'
     and 'a5a1bb0dfcc9fe8ad8eb18505cdf8ccf37310788'