merge of 2ff27dc2432bb6df1bec19deafdff91dbb72f2c9
authorMichael Lauer <mickey@vanille-media.de>
Fri, 14 Apr 2006 13:08:20 +0000 (13:08 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Fri, 14 Apr 2006 13:08:20 +0000 (13:08 +0000)
commit22174f65634f38287bedc42a35c2da6c5577a807
tree74d00b5030102baca41100292bd6c93bc07168ef
parent1c2e41c28d2c5f8ed5a46a3f750b95c09b3db850
parent3b3f3f4da734d0f86331f1469c6c391dbda1368c
merge of 2ff27dc2432bb6df1bec19deafdff91dbb72f2c9
     and 540e74d92c3ae03760fd0c13786f2dc1fcd4d838