merge of 0999703813e827e2010766c4f16c850b72e85f01
authorMichael Lauer <mickey@vanille-media.de>
Sun, 25 Sep 2005 00:57:58 +0000 (00:57 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sun, 25 Sep 2005 00:57:58 +0000 (00:57 +0000)
commita0a6a9203a15e13fcbc60d3f59ad37c59f1d5ba6
tree9068de4d113d6bc94c0ef0d9573f9956ac03808f
parent52fc464946f780b1302fe9ac47176415faf5ef9a
parent5f4f99dd916ac86e40b58decb2a0163067edce58
merge of 0999703813e827e2010766c4f16c850b72e85f01
     and 6c47e659bdc5f5f73c5abe5b762e5ba029bb05bf