merge of b19adf0c94378bc7f986e8f497a7aed16f2453b8
authorMichael Lauer <mickey@vanille-media.de>
Sat, 6 Aug 2005 21:37:30 +0000 (21:37 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sat, 6 Aug 2005 21:37:30 +0000 (21:37 +0000)
commitb93242895af2326a62eefe85d85b83dbe5457fd4
tree145f21aaeaf5c1cbc844ed8bc312f586ad53cebc
parent1c5f9e218c003dafb099587cc891e367c4f56490
parenta8486d9c2db1abc08c5ad05379705890f1c1ad96
merge of b19adf0c94378bc7f986e8f497a7aed16f2453b8
     and bc7105815352b23ea8f59490f29698429c7c08f1