merge of 3a3ce2ba295b051169b23016abf8c2dc694c11f2
authorHolger Freyther <zecke@selfish.org>
Sat, 27 May 2006 18:36:06 +0000 (18:36 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sat, 27 May 2006 18:36:06 +0000 (18:36 +0000)
commit3c913bc4ba7d572c5ab9ca85231fb9a82ad7efaa
tree3b1bdd82e709b4b73065ebe66b7ee099a3f7352d
parent71de8686ca32a6e77c72d96180979bcbb5869067
parentb4aade330e5191ba9a0a28c37e04da4ddb6148a4
merge of 3a3ce2ba295b051169b23016abf8c2dc694c11f2
     and cd5dfac4524135d71f6f42fb7d1288b700ec5d38