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

merge of 2eccf1b9297e1bdfb05d568694f7c92afa03eb9e
     and a99a1b40b0c3079093094218ed369481d70fecd4
---

28ae043187520daaa291ce8fc068dae9aee40334