merge of 1a161e3d9f46581507d1542d1112d40c07481893
authorMichael Lauer <mickey@vanille-media.de>
Sun, 21 Aug 2005 23:27:23 +0000 (23:27 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sun, 21 Aug 2005 23:27:23 +0000 (23:27 +0000)
commita98fc361734009b592044b9b73dfdce3f20caebd
treeed1c482af1438c64fae7c55fac6f75f044d21e56
parentae42b584567768fdf2bdb8ec5ceee69fb6357c4d
parent591c5f29edc1a5260b78e02d6968310bdd3a75d8
merge of 1a161e3d9f46581507d1542d1112d40c07481893
     and 80954f6b3dd012af79d0b0eecc7015cd1b46aa27