merge of b1410ede664e298061d74b36181c097dd76a0b22
authorMichael Lauer <mickey@vanille-media.de>
Tue, 9 May 2006 12:33:25 +0000 (12:33 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Tue, 9 May 2006 12:33:25 +0000 (12:33 +0000)
commit90565edaeeff274c31d8b237d70819663208898a
tree565dc4c89e7a987e882589095b1e70cc3292ae05
parent218ddf031b7d5ea3ffb795adb1a0ddfc2cd32aa3
parentd2355d4ce22e938e111d618c4f599e64ecc24977
merge of b1410ede664e298061d74b36181c097dd76a0b22
     and f43c0bbb64e7f30530654a0eb2acb35a6b82ce97