merge of '7ffa21c0488fe0c49d50573aa879df722ab0c3a5'
authorKoen Kooi <koen@openembedded.org>
Thu, 10 Aug 2006 13:56:00 +0000 (13:56 +0000)
committerKoen Kooi <koen@openembedded.org>
Thu, 10 Aug 2006 13:56:00 +0000 (13:56 +0000)
commit6b2b3026d13d1fcdf66cfd9969c3c6549030375d
treed2b66c02d278f1abd85a28cedc10078846fa117d
parentee9f43c21951851f7bdd46b412167b8a85353a21
parentcbd481e248401ed1f29272f560d1e2a1267d4d51
Merge ... '7ffa21c0488fe0c49d50573aa879df722ab0c3a5'
     and 'f7b4e3c2936aace229411ee357133e0f675f04e7'