merge of 01d13ac2c361ef4b10719889dea72fd4630df482
authorMichael Lauer <mickey@vanille-media.de>
Tue, 25 Apr 2006 18:50:34 +0000 (18:50 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Tue, 25 Apr 2006 18:50:34 +0000 (18:50 +0000)
commit03978ed0dbd7b718171cfe8605b65ea4da20a146
tree23474a4e7c8e187bf858439aab67b461c7bfb578
parent226c6e48f2276309029248cf5bb11f8926909466
parent97d951baea0b7278634118ac3db1a2584820b5f3
merge of 01d13ac2c361ef4b10719889dea72fd4630df482
     and 551667095e22fd8245f03b1ae7d45c0c5a3ec1c3