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

merge of 2510e5252ac32a4848eb302514a1d35602ed7afd
     and 65b0cd64eeef02b789460148d6bb958749417f11
---

69d51a4e09adf355137b0cac65eda31227723c3e