From: John Bowler <jbowler@nslu2-linux.org>
Date: Tue, 7 Feb 2006 08:09:48 +0000 (+0000)
Subject: merge of 282bd719dad582050c3698357176c4c2a53181da
X-Git-Tag: Release-2010-05/1~9453^2~2418
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=51c5a200c7290e8d8a20ae8d4bb0d51684125e04;p=openembedded.git

merge of 282bd719dad582050c3698357176c4c2a53181da
     and 7bd8e93854d7d1cbf3ae66788c128c85d9f80d0d
---

51c5a200c7290e8d8a20ae8d4bb0d51684125e04