merge of '348938c3555546469580e952fd705c085456a048'
authorKoen Kooi <koen@openembedded.org>
Fri, 13 Oct 2006 14:15:09 +0000 (14:15 +0000)
committerKoen Kooi <koen@openembedded.org>
Fri, 13 Oct 2006 14:15:09 +0000 (14:15 +0000)
commitf5116661aff73a611670fa3f1f052c3e38ce901b
treede0ce037e6f5688890cf642caa21c5150c8d973f
parent3bf1b3c6708a5e2534bf819163d682e5efd75385
parent5d664cd2836bccd44e89eace8ebe9a215e84c2e8
Merge ... '348938c3555546469580e952fd705c085456a048'
     and 'fd7e0b1c50f0c7757052ee02bc3a484be06cad6e'