merge of '14667242175a1d72fe6a6278ffb941a5c170c04f'
authorKoen Kooi <koen@openembedded.org>
Wed, 9 Aug 2006 13:11:18 +0000 (13:11 +0000)
committerKoen Kooi <koen@openembedded.org>
Wed, 9 Aug 2006 13:11:18 +0000 (13:11 +0000)
commit52882c747b8dbbc8db5bef86c95f9456cd422699
treec6e0431e4f5e2b8e98d6dca81d667c877ffd3e90
parent36460fdf5f4cf582543750f486fec6d96b6c8481
parente6bc829ae2d1bf9020b1fb22e50607c13eab324e
Merge ... '14667242175a1d72fe6a6278ffb941a5c170c04f'
     and 'f09491a3dc7f40ea6081d29c8983a1cc97e84ad3'