merge of '1c4ee14296c98438edf9aebdbe655db562583e52'
authorKoen Kooi <koen@openembedded.org>
Wed, 16 May 2007 10:58:08 +0000 (10:58 +0000)
committerKoen Kooi <koen@openembedded.org>
Wed, 16 May 2007 10:58:08 +0000 (10:58 +0000)
commit15f974e4595881a1f308a00e27184be450ca1f4a
tree8a4955c535af55ed6c247b2f9a6b36f766ca41ff
parentaa4b544f65b89c234e4960d4cf77f241e93298f1
parent1159a43c860b48790a06f1b76d069c96aaff8d68
Merge ... '1c4ee14296c98438edf9aebdbe655db562583e52'
     and '6f56c7d82482d2097d9668c7a97af22ea3e644b8'