merge of '10d887a6bc65bb22550e2964935e1dea718ab462'
authorKoen Kooi <koen@openembedded.org>
Tue, 3 Oct 2006 21:04:39 +0000 (21:04 +0000)
committerKoen Kooi <koen@openembedded.org>
Tue, 3 Oct 2006 21:04:39 +0000 (21:04 +0000)
commit41e110b86d7ece85d33014be4e689d41882b3f76
treeb9d8196ce77a463ba450351f6c7612f6599672e0
parent38cfb0452694b87a063322e2fd51df68c246bb4b
parentd71e04d940fab47142d18c6cf378cc1a42757564
Merge ... '10d887a6bc65bb22550e2964935e1dea718ab462'
     and '5a0ba6276c9c5a55e17b2681a1d2220b37d09582'