merge of '5488dcb57b02d59ec27d65e068bc0069a4e4c86e'
authorKoen Kooi <koen@openembedded.org>
Sat, 29 Jul 2006 16:11:31 +0000 (16:11 +0000)
committerKoen Kooi <koen@openembedded.org>
Sat, 29 Jul 2006 16:11:31 +0000 (16:11 +0000)
commit2791ba697a8b671e44aa79214672ea1fb5638137
treecd9b061d9269c3e13ec80aeff973922822afdab3
parentafec6583347a94eaa5d80caf2ae48f5e3600fdd4
parentce493aa6f96884a517b935401805908728128d79
Merge ... '5488dcb57b02d59ec27d65e068bc0069a4e4c86e'
     and 'a3d194bab430424d2cb654ed59d6b0f9f8952f83'