merge of 4a2c16678b05253a5736aa917a28e66052c746f8
authorPhilipp Zabel <philipp.zabel@gmail.com>
Wed, 24 Aug 2005 19:31:29 +0000 (19:31 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Wed, 24 Aug 2005 19:31:29 +0000 (19:31 +0000)
commit504ee24ca6fe600c0d2586d78aa9ad8b17510f14
tree189c431e6c80a7d92b1690161482eda1149058f2
parent1d298ceb8b72cb6782bf62ef0cd1911cf41ef8fa
parent6d897058ee420e6ac26a177c34b6fbbc4452f61c
merge of 4a2c16678b05253a5736aa917a28e66052c746f8
     and beb1b8b2c854886cbbad1a336b492fa8b7ad78be