merge of 8296491e9a6698946dcd0f0fe1002e56eab01cdc
authorPhilipp Zabel <philipp.zabel@gmail.com>
Sat, 3 Sep 2005 12:09:42 +0000 (12:09 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sat, 3 Sep 2005 12:09:42 +0000 (12:09 +0000)
commitfc81ab31b7e881f3c4c6b0ddccc1688943272cfe
tree6e0cdf5725367ef0d51bcb36e8147ebaa765e064
parent28517612960a4711c83bab4a1620f8f5e02a5121
parente1d478a04ffa8e6ac48e9be0c3b4b5810ccaafb8
merge of 8296491e9a6698946dcd0f0fe1002e56eab01cdc
     and 9fd3eb06066308e4db4d8943596c93a38f87f440