From: Derek Young <dyoung@nslu2-linux.org>
Date: Tue, 30 Aug 2005 18:30:50 +0000 (+0000)
Subject: merge of 3b6e717ac4b3d4463cc77877b9a9a94b8d50b9e9
X-Git-Tag: Release-2010-05/1~9453^2~3696^2~2^2~1^2^2^2^2~1
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3f7e6426b4f15847b28e54eaa8011144bc6e9597;p=openembedded.git

merge of 3b6e717ac4b3d4463cc77877b9a9a94b8d50b9e9
     and bf33034c282dd64819d4e41c15ee67d96dd56337
---

3f7e6426b4f15847b28e54eaa8011144bc6e9597