merge of 58b70d443320302d28d40f3bbd27c219a60956cb
authorMichael Lauer <mickey@vanille-media.de>
Wed, 7 Sep 2005 22:05:19 +0000 (22:05 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Wed, 7 Sep 2005 22:05:19 +0000 (22:05 +0000)
commit3bd541d01751acee647413bc82ca1467c04210bc
tree2f663c6ccb3b90183bcfd3413eb4fe0fe72ce9c3
parent6fad7dd3d21a5e9e34c3324e80533abc05a4a233
parentb46a9fb885bca4c240de4a0df3bb521f7a518b34
merge of 58b70d443320302d28d40f3bbd27c219a60956cb
     and d4055289778245dd9f7f2e2649e8a6d4935189fd