merge of '2de185389e4f5cf5e749eb1645efe691e9fad4f8'
authorKoen Kooi <koen@openembedded.org>
Tue, 14 Oct 2008 09:57:15 +0000 (09:57 +0000)
committerKoen Kooi <koen@openembedded.org>
Tue, 14 Oct 2008 09:57:15 +0000 (09:57 +0000)
commit719cbb681136930433ade1268a6555e6509bdd80
treec1fe2c0c523293d3ec71c825d448467f7ec30aaa
parent0ab29fdd53b2bfbc72c760e1d8360049e194c88e
parent7922c8985821d44774f248ab3bd73611163e7ed4
Merge ... '2de185389e4f5cf5e749eb1645efe691e9fad4f8'
     and 'e6fa426a909123cbd9d0a3fdf92a16a53c9722e9'