From: John Bowler <jbowler@nslu2-linux.org>
Date: Sun, 5 Feb 2006 22:18:24 +0000 (+0000)
Subject: merge of 40d10bcbb5038258ca03225d0154ca5e48858b4d
X-Git-Tag: Release-2010-05/1~9453^2~2436^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9fc42a7dd92e6104ab7c4077507d93d35be7bf95;p=openembedded.git

merge of 40d10bcbb5038258ca03225d0154ca5e48858b4d
     and da977902d209ed78b9d35354ede0aa20347a5f1d
---

9fc42a7dd92e6104ab7c4077507d93d35be7bf95