merge of 0deeba4cb660a5020ac4c327942edd6b08498456
authorPhilipp Zabel <philipp.zabel@gmail.com>
Sat, 14 Jan 2006 18:31:36 +0000 (18:31 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sat, 14 Jan 2006 18:31:36 +0000 (18:31 +0000)
commit950748d385d97e52cab9e4cfbea74f62a5ebca3f
tree0ba677a840f9c750e4dcae2bcd69e030305f379a
parent9c28865bb02633562f1db6047c3c6834479d7b0f
parent3e5d1c6ec3395a153f1baede2eaae47c01f2b9cf
merge of 0deeba4cb660a5020ac4c327942edd6b08498456
     and fba844d11d33af8cda04754102aa9c403bf71d1c