merge of '3eeee83b495171a3097820abe214e3b9259e3c69'
authorMarcin Juszkiewicz <hrw@openembedded.org>
Tue, 28 Aug 2007 13:52:00 +0000 (13:52 +0000)
committerMarcin Juszkiewicz <hrw@openembedded.org>
Tue, 28 Aug 2007 13:52:00 +0000 (13:52 +0000)
commitc485e94a4a2a2db61c39cc8c3013ed1407e04e28
tree8f428052aeabce911e05da6ec356a341c15e846f
parent2d9792a4505c70d8f1608e031fbccbcb5d752336
parentaa58b8e74004d3e3f14d0572d3655d703d125926
Merge ... '3eeee83b495171a3097820abe214e3b9259e3c69'
     and 'b2b1b0bca3e6611843f9d75414f27a3b4f74a64b'