From: Derek Young <dyoung@nslu2-linux.org>
Date: Thu, 8 Sep 2005 23:15:58 +0000 (+0000)
Subject: merge of 394aa1ee96c4574cc5cb238593d0bb72ed8674e6
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c8ff6f27d45936d1d6932c348ce0db921a1d9d2c;p=openembedded.git

merge of 394aa1ee96c4574cc5cb238593d0bb72ed8674e6
     and 3d296e3ebdf47d22e6d6437432ebacacb85fec05
---

c8ff6f27d45936d1d6932c348ce0db921a1d9d2c