From: John Bowler <jbowler@nslu2-linux.org>
Date: Tue, 29 Nov 2005 18:03:16 +0000 (+0000)
Subject: merge of 36bba38125b0902fe1eaddcaeaa996528cbb7364
X-Git-Tag: Release-2010-05/1~9453^2~2960^2^2~9^2~2^2~3^2^2~2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=418712a6150eff75c557860538f605b2856f18c0;p=openembedded.git

merge of 36bba38125b0902fe1eaddcaeaa996528cbb7364
     and c125c8208cfb52ff3cc6e96a78bf4376459ea611
---

418712a6150eff75c557860538f605b2856f18c0