merge of 9670e736a83e6a2cd24cf9ee212df96f51b9f7c2
authorMichael Lauer <mickey@vanille-media.de>
Thu, 21 Jul 2005 11:56:43 +0000 (11:56 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Thu, 21 Jul 2005 11:56:43 +0000 (11:56 +0000)
commita78c0d50d94f25d71da5d52d3fd8975a670fc55c
tree4c441f1acaed203ae706bdaff6a9c88f7fa0de46
parent7ff7c964e027b86c67f7eb738bdfb9f2bc102a59
parent48ceec0f1521da502f3fd5ca1f8f9a6158c32bb5
merge of 9670e736a83e6a2cd24cf9ee212df96f51b9f7c2
     and d70f182e969169a90e7b31e49ef541b824500c5f