From: John Bowler <jbowler@nslu2-linux.org>
Date: Sun, 14 Aug 2005 20:06:46 +0000 (+0000)
Subject: merge of 2f5ec9223fa71bbca67ec2ecb5e1b62ddbc450d4
X-Git-Tag: Release-2010-05/1~9453^2~3858^2~22^2~7
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=03ee4dd94432e599b473d2bd5d1a2b7d888b932e;p=openembedded.git

merge of 2f5ec9223fa71bbca67ec2ecb5e1b62ddbc450d4
     and ca933b7b66ded3fc8d2fbdd358a83e93f951f920
---

03ee4dd94432e599b473d2bd5d1a2b7d888b932e