merge of '19314063bd11741e9ecbaaf39f836c03d4127357'
authorKoen Kooi <koen@openembedded.org>
Thu, 2 Oct 2008 11:48:02 +0000 (11:48 +0000)
committerKoen Kooi <koen@openembedded.org>
Thu, 2 Oct 2008 11:48:02 +0000 (11:48 +0000)
commitbdbfc51c061df4fad17a8ae942bc82e3b5b27e8d
tree866723584682efdb5d89d38953f584e10043af83
parentd5f8d512871d4a702261a5f479f444d4ea9ef875
parentd5a76b0ccd1dee2133e8c69d770f1b3c3c770ebd
Merge ... '19314063bd11741e9ecbaaf39f836c03d4127357'
     and '3fdbb9ca8878cd328a406fdd3338f21ab71a3f3d'