merge of 8f860e5acf5f3449ded79e9bc876a6b5b70cbc47
authorMichael Lauer <mickey@vanille-media.de>
Tue, 11 Apr 2006 13:56:01 +0000 (13:56 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Tue, 11 Apr 2006 13:56:01 +0000 (13:56 +0000)
commit73bb03136687ce1e0c74129c389cf8f3029c05d2
tree5c11db826c2d8d164374e917072bf4db995dee26
parenta483480644dc47ac080d962b3f6f7642c53250ca
parent0f2930a64752fb2b7a1efd246ec08d7ab2c5dd53
merge of 8f860e5acf5f3449ded79e9bc876a6b5b70cbc47
     and fde5a287da3f85a26581cb7c6634cc8fb3ca4a59