From: John Bowler <jbowler@nslu2-linux.org>
Date: Mon, 6 Feb 2006 08:30:48 +0000 (+0000)
Subject: merge of ad980e031ab94ad3b8f2d1e29f2bbae35f47d710
X-Git-Tag: Release-2010-05/1~9453^2~2429^2~1^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d2449f188c1d5b589a2e26dd044d3c717e36cb42;p=openembedded.git

merge of ad980e031ab94ad3b8f2d1e29f2bbae35f47d710
     and ae1272cefbd4147e462e255072a2484f4f9a7a1b
---

d2449f188c1d5b589a2e26dd044d3c717e36cb42