merge of 701e498cb6b22382fd13e288d7b47f93abb32feb
authorMichael Lauer <mickey@vanille-media.de>
Mon, 15 May 2006 14:51:32 +0000 (14:51 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Mon, 15 May 2006 14:51:32 +0000 (14:51 +0000)
commit0bb8c3044a3122a2af92f1749fbccddd9254bfce
tree2cfa93b106921505646f10a0017ec99aaa8a5dc2
parentdb00d03b1d5fbf78f7a2eae2802f6c8a7691935b
parent167ec12f015cbb50d681aae5d608e5f3422b43fb
merge of 701e498cb6b22382fd13e288d7b47f93abb32feb
     and a3de2e3141246a68170d4fe5e4a7390e7ebe041e