From: John Bowler <jbowler@nslu2-linux.org>
Date: Sun, 7 Aug 2005 19:53:15 +0000 (+0000)
Subject: merge of b429c0f1af49e05679400d4ba67f96a25e2b4316
X-Git-Tag: Release-2010-05/1~9453^2~3954^2~1
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=63b5097099d083e9e9ec8f8e1fd4c9da1e2667c2;p=openembedded.git

merge of b429c0f1af49e05679400d4ba67f96a25e2b4316
     and c9a59c1ab8b4309afa4a724e1a72443b01fd97b8
---

63b5097099d083e9e9ec8f8e1fd4c9da1e2667c2