merge of 55fefa60fda5100c3bc1a4ecf8d48d0ea4bb9193
authorJohn Bowler <jbowler@nslu2-linux.org>
Mon, 26 Sep 2005 23:09:24 +0000 (23:09 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Mon, 26 Sep 2005 23:09:24 +0000 (23:09 +0000)
commit6db0b6a0cb706c2908a4af0e18acc497e7497201
treebe4a6eba2290e92e908eabcd151c578c69ea6631
parent83efa27db510e78468b22e11eef08dc227a10842
parent22e1decc3ce721ae1f5fe3b4ae6540059b71b169
merge of 55fefa60fda5100c3bc1a4ecf8d48d0ea4bb9193
     and bbe482d809300bb4339549751dc0074a94dd6e6e