merge of '3749ce8294a43abc3797bff9e431e3c309e9847c'
authorKoen Kooi <koen@openembedded.org>
Thu, 23 Aug 2007 11:33:00 +0000 (11:33 +0000)
committerKoen Kooi <koen@openembedded.org>
Thu, 23 Aug 2007 11:33:00 +0000 (11:33 +0000)
commit62b7811b4dd8abdf311d339ab3e75cc0da2ee5ca
treec253953489e6cbaf408bbfd261a6402d110bb09f
parent39e6582b3f2f45defdd5a2de4437764d9b315a6d
parent3b3f3e9a941121bba91ce0bcacc1c0cb1bda0223
Merge ... '3749ce8294a43abc3797bff9e431e3c309e9847c'
     and 'fc740829a6a100c7e57ef906efe639744bdc73a1'