merge of '355262927125dc01051bf0f6b36fc492b766c9d7'
authorKoen Kooi <koen@openembedded.org>
Mon, 31 Jul 2006 16:56:20 +0000 (16:56 +0000)
committerKoen Kooi <koen@openembedded.org>
Mon, 31 Jul 2006 16:56:20 +0000 (16:56 +0000)
commit3da9a257c6618a0300eb69c828d0213555ec5fcf
tree8bc115db976a61dce7b40816b8e6d1ccaddec72d
parent811e3155cbb997ba8e5e53af3d170c26ee85005c
parent467e77f1bb2df906586e318d20e5191633c2a48f
Merge ... '355262927125dc01051bf0f6b36fc492b766c9d7'
     and '60557e20a6b9593541f74b8231f50e85bf385819'