merge of 53eb13501a2259cc700bd74c6a4d5b7022eb3d69
authorMichael Lauer <mickey@vanille-media.de>
Sun, 11 Sep 2005 20:59:08 +0000 (20:59 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sun, 11 Sep 2005 20:59:08 +0000 (20:59 +0000)
commit79f476dc493d2566cd235760f874490478f9be1c
tree03319a0f7f1adc5a0da42897a9c52ab51dbdb5ad
parentb4d7c99b58c6ffa2586d0fd92fef99339e154b1d
parentb76fb6d7da96071ae4536a4d20ff594c50f10673
merge of 53eb13501a2259cc700bd74c6a4d5b7022eb3d69
     and 7123616b4991ab3d5b73ef32b51e555cacf38b72