merge of 'b01d1445a9bec64883dc3658a911ae78a7a3fdf3'
authorKoen Kooi <koen@openembedded.org>
Thu, 6 Dec 2007 18:18:01 +0000 (18:18 +0000)
committerKoen Kooi <koen@openembedded.org>
Thu, 6 Dec 2007 18:18:01 +0000 (18:18 +0000)
commita780b447814eb7c2c42251236d944dbb277d79d7
treefcc9a62e35bfb2ac7d2906fe1974f2c147aadb56
parentd984d4b907f03182e1da91fd645fdfd61bd892d5
parent057a49bd75d1ce123c93559d6cbcbb4b7bd16ca0
Merge ... 'b01d1445a9bec64883dc3658a911ae78a7a3fdf3'
     and 'e28b8a60e16c1ac1bc401bef085f99994a52d98b'