merge of 6d1ae8b64aef6872327fda9386a4c9de48ac51ad
authorMichael Lauer <mickey@vanille-media.de>
Tue, 11 Apr 2006 21:57:24 +0000 (21:57 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Tue, 11 Apr 2006 21:57:24 +0000 (21:57 +0000)
commitd7fdbd54f7edf0b9bf16a6973ad1eb376d4a062a
treeadcbb7a3f22e7e5f011e57a99c54e743f0168a88
parent7c991b3378ff3e341bf208e5ea70db52b77bdc27
parente24289ed05419c60f643447c0ee56eab4b5aa499
merge of 6d1ae8b64aef6872327fda9386a4c9de48ac51ad
     and cf0ac36eb0b92807b4cbaa71705e63023abf1cca