merge of 2b7e98de2ae7babc1fba7bf05e9cd56e79bd2aa3
authorMichael Lauer <mickey@vanille-media.de>
Sun, 21 May 2006 21:13:54 +0000 (21:13 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sun, 21 May 2006 21:13:54 +0000 (21:13 +0000)
commit2add570ff8afa0136ba9eff5b7a1b3caf870a377
tree144667bf2c012e0dc981dcb17e43b2da57f10d1b
parent97d2dcb600cca3100b1ca27c652fb351178a2482
parenta12a7c5fcd84510143af144645e8c1db363ba1c6
merge of 2b7e98de2ae7babc1fba7bf05e9cd56e79bd2aa3
     and b8059643b9bf29e34eaa1ca3277803350bd390bc