From: John Bowler <jbowler@nslu2-linux.org>
Date: Thu, 22 Sep 2005 19:48:50 +0000 (+0000)
Subject: merge of 71128e6c89c536ab0046ade14dfc6c2b2dc7b2e4
X-Git-Tag: Release-2010-05/1~9453^2~3458
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1b30b03d22ce1adab22427bf6674ef3d5fc96c50;p=openembedded.git

merge of 71128e6c89c536ab0046ade14dfc6c2b2dc7b2e4
     and decc2032888381bf591149b1c37d124ec383c249
---

1b30b03d22ce1adab22427bf6674ef3d5fc96c50