merge of 6140847fcfac52c881f2bf65906299e435571b8f
authorFlorian Boor <florian.boor@kernelconcepts.de>
Wed, 18 Jan 2006 10:59:59 +0000 (10:59 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Wed, 18 Jan 2006 10:59:59 +0000 (10:59 +0000)
commit3d3c02597e3e07fa1150ed6117f1134fc93784bf
tree70088f9fd8e78cd53e98d7332ddb5a0e972b63b9
parentb8b4281b33aa1bfd9125092d113e674905381c3b
parent43cd3c0c6b338107c3540233600f2a0bf16854e1
merge of 6140847fcfac52c881f2bf65906299e435571b8f
     and 9c6d2f9ed3be4745760b4dcd14811587f4acd623