merge of '1427a8ede5b7d37a89b207e3552cbe6a842fcc22'
authorKoen Kooi <koen@openembedded.org>
Fri, 3 Oct 2008 08:56:06 +0000 (08:56 +0000)
committerKoen Kooi <koen@openembedded.org>
Fri, 3 Oct 2008 08:56:06 +0000 (08:56 +0000)
commite36d903760a90389bbc46a89fdf5556c38f4966d
tree2c9d0537ee3273031a9fbe81dd80a729f46a69c3
parentf876463527bd9ae92a09159fdb4899b4a4d19121
parent0b4e030c8ead47ccbbefd57a96b7f78157d12f39
Merge ... '1427a8ede5b7d37a89b207e3552cbe6a842fcc22'
     and 'c9705f706a05f04be17dd411ebb566e068b9dc83'