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

merge of 8982ebf16224df4ea5b5e7852e63112f004bbd33
     and a89d5956fffe61c303ff6a056247b5569871e5c5
---

3d93c6e8a04292859eef29ed4472be3b09a4fc11