merge of '3ec01b0a91ae1b235f0cba59ba95f67f6b6f859f'
authorKoen Kooi <koen@openembedded.org>
Fri, 30 Mar 2007 17:49:35 +0000 (17:49 +0000)
committerKoen Kooi <koen@openembedded.org>
Fri, 30 Mar 2007 17:49:35 +0000 (17:49 +0000)
commitf2ddbcc43d7515d14d9d7ffb6d6b6ed3dcd1881d
tree281f82be333a50fe5fd5ad904ab4a6f33c005707
parent2df3b015934b915f58a4bde3e3b60b630b6650e2
parent84b73c36e73e10b7fb44c762baebf00763a734a2
Merge ... '3ec01b0a91ae1b235f0cba59ba95f67f6b6f859f'
     and 'ff4cec497cf85d040a1be5d8659847f858cdd4c9'