merge of 0fb0ebb33b635bc17b0a13f6da59e6bd1b474b79
authorMichael Lauer <mickey@vanille-media.de>
Tue, 11 Jul 2006 13:28:05 +0000 (13:28 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Tue, 11 Jul 2006 13:28:05 +0000 (13:28 +0000)
commita5e3363e9083cd0f2a4ee111f2bb64c23bb56598
tree963c33cb17ca309b50ee8b2a0ce73d9af5b47b53
parent4040941c8122f1bba5750b71d1728f003fce626b
parent27a9d3c1073bee43c8aa65325a24a6f7e91d9cf7
merge of 0fb0ebb33b635bc17b0a13f6da59e6bd1b474b79
     and a853b21c963bb2e9056ecffcbc9af65a6b73aa1f