merge of 5b224b4c91dec0b22ff45bec26fb18a01889e139
authorMichael Lauer <mickey@vanille-media.de>
Fri, 16 Sep 2005 19:33:18 +0000 (19:33 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Fri, 16 Sep 2005 19:33:18 +0000 (19:33 +0000)
commitbafe70effea2e3052ce0e5170eaf5945543f6a3a
tree5fa35ed08b0a3a77fcf7f6171a31e3ef1e7b8c3a
parenta8e6dafa7a35f7c074f2cb8b2d26dd6c3366c7e1
parent492679b45c848f112a18c7b7095b4e81f0a5668e
merge of 5b224b4c91dec0b22ff45bec26fb18a01889e139
     and d2f84a64a7e1bb56cc4b2e67eec15019f5e59084