merge of '1a21079a72078639c12d843797719e166601e64e'
authorKoen Kooi <koen@openembedded.org>
Thu, 17 May 2007 08:02:57 +0000 (08:02 +0000)
committerKoen Kooi <koen@openembedded.org>
Thu, 17 May 2007 08:02:57 +0000 (08:02 +0000)
commit3cf9d6280f83d1ecf17c6aad8f1a79cf358d5e2d
tree2d225d23f180055299d283329941b98bc74bfba5
parentb693890af8ab12e32df75e920d711790fcbd7364
parent535777c244a0277d692e6651b36ab168c3eed58e
Merge ... '1a21079a72078639c12d843797719e166601e64e'
     and '64fe11e01c9845f19dd3d5403d1680b675228460'