merge of 183a7abb14b61cce40ef9860783b1523f0caa0cd
authorMichael Lauer <mickey@vanille-media.de>
Tue, 9 May 2006 14:21:10 +0000 (14:21 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Tue, 9 May 2006 14:21:10 +0000 (14:21 +0000)
commit2452e96ebf0d1a5c9fae35ad56383d6fac3ef031
tree4172732018d7eecf04e2873cf634b18f2cd34ff9
parent487b448b03e307560aeba9be4cc5051006796621
parent6f51fcc034e53a984af16f57fd9bf62affa009a3
merge of 183a7abb14b61cce40ef9860783b1523f0caa0cd
     and 579c05403bf5a71c89a55a696898f027db224a5e