merge of 236d70d96b3f9300bb6e751a5d3f3ea13f9a04db
authorMichael Lauer <mickey@vanille-media.de>
Fri, 23 Jun 2006 23:15:59 +0000 (23:15 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Fri, 23 Jun 2006 23:15:59 +0000 (23:15 +0000)
commit051fd93bc33d08e08e2373149e198b65cb18d43d
tree5af8c07f3afde046c010f2a0231d5e0b2037bf2b
parent4cdcfd0fb6a0f711bb6a0c33656273e67bf97b9c
parentf39b5244893240c0bdba42a28b12542ceff494f5
merge of 236d70d96b3f9300bb6e751a5d3f3ea13f9a04db
     and f4984d1bec6ce4b4b676ecf827227e24bfb4eab1