merge of 02169d766c8620f531bb081faa58a6d1c2277f1e
authorMarcin Juszkiewicz <hrw@openembedded.org>
Wed, 21 Jun 2006 11:45:52 +0000 (11:45 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Wed, 21 Jun 2006 11:45:52 +0000 (11:45 +0000)
commit91564285c8b22b2ce3254cdcc00caff8eb3f15a9
tree5e1431bcb022723cb16d4e601a487a928a9aa9ee
parentb46f17239ea98883630b1a22fa82cb6cbf4ed0bc
parentc42d24b5fa03ee99ee73030dd09e93d6dd1eb14a
merge of 02169d766c8620f531bb081faa58a6d1c2277f1e
     and 0e599c9a0360342db2527204c85039a49aec6d93