merge of f81152e068aff509b6a52bcc8ada77a0a0c1f09e
authorPhilipp Zabel <philipp.zabel@gmail.com>
Thu, 22 Sep 2005 14:12:48 +0000 (14:12 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Thu, 22 Sep 2005 14:12:48 +0000 (14:12 +0000)
commit39a883f9a0f74d9c33f7f9f72bf497264265c97d
tree1baa8a5137dcd7003f7cbb5585e2ad0c5427cc9c
parent89dd14a2a673ab49867fa1e815a9238b9ea183eb
parentb01d6f27dc01c116b6d453097efa5c831b585482
merge of f81152e068aff509b6a52bcc8ada77a0a0c1f09e
     and ab4108f74e6e141a9205e560ab76a02ddff2604f