merge of 25f8c526f6726d19c4ef8cfc766c7666c58c3c4c
authorMichael Lauer <mickey@vanille-media.de>
Tue, 16 Aug 2005 22:02:30 +0000 (22:02 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Tue, 16 Aug 2005 22:02:30 +0000 (22:02 +0000)
commit308a3289426a73ae7c5493c1704365955e3ccd82
tree8bd21311cff00731869d620c0521c7c3f057cb86
parent4ff380989becb5699023ee71a7a247f0dfda17b7
parent0064878fc602368bb630c48a8affac3b3d2b654d
merge of 25f8c526f6726d19c4ef8cfc766c7666c58c3c4c
     and 3c94be02c338e9f42138bc4421a6de729400db41