merge of 1a01264e65b67ef85967a894ab8c3c3f4ceec72f
authorKristoffer Ericson <kristoffer_e1@hotmail.com>
Wed, 12 Jul 2006 18:45:01 +0000 (18:45 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Wed, 12 Jul 2006 18:45:01 +0000 (18:45 +0000)
commit013176285df78d1dcd75605c62271eada172c6ca
tree4772309e17e30f99d95a07e627430f002ca2d02c
parentb96d67560f2796fc73507dbfedb57125b89addd0
parent7e6480915159a532bc0b81d8713eb4c626099b08
merge of 1a01264e65b67ef85967a894ab8c3c3f4ceec72f
     and 1fa6c1c3697b65f0d94b189442fe08e25d336652