merge of '224b10a52b5c05999e18cb7bfe86f5706f939f89'
authorKoen Kooi <koen@openembedded.org>
Thu, 1 Mar 2007 20:39:37 +0000 (20:39 +0000)
committerKoen Kooi <koen@openembedded.org>
Thu, 1 Mar 2007 20:39:37 +0000 (20:39 +0000)
commit4e41d9dd01996b7a1f49a8b33c85d68888595e9b
treed89d2e90a81c8f7b8ef9570791113bb9d5e19006
parent3338e8be8a499430aab445cce5fc42ecad941f23
parent535f336152c3f10bffaa52e2526ff4cda299e44a
Merge ... '224b10a52b5c05999e18cb7bfe86f5706f939f89'
     and '8b2e0e9b5ba615d4e80a7932813416e9775c6be9'