From: John Bowler <jbowler@nslu2-linux.org>
Date: Tue, 19 Jul 2005 23:03:42 +0000 (+0000)
Subject: merge of 80a8130b3da0a98fbccd7bef8f3b8647239e6bc2
X-Git-Tag: Release-2010-05/1~9453^2~4119
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=90e48831927b2de7840f8bf1ae3ffe88d1f0bc70;p=openembedded.git

merge of 80a8130b3da0a98fbccd7bef8f3b8647239e6bc2
     and 9ce79f682762916b0f219b8a3517a242d0c38eb1
---

90e48831927b2de7840f8bf1ae3ffe88d1f0bc70