merge of 57ac60221ec66341d6031290ebe0ea39dea0b9c7
authorMichael Lauer <mickey@vanille-media.de>
Fri, 14 Apr 2006 15:27:00 +0000 (15:27 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Fri, 14 Apr 2006 15:27:00 +0000 (15:27 +0000)
commit64a0899b9317814694d2a80b42edd7f0896d1507
treeaa402bd7fa088ecffb86ad348c1be2b82deea5cc
parent511f610654ce94cd5d0030e1af17a37c7c4ccffb
parentf42b0f7d3dffbf3e6f14de26825a231ba1424de2
merge of 57ac60221ec66341d6031290ebe0ea39dea0b9c7
     and 9e2b0b36ac437fa39c2d640705951c444373f8c8