From: Derek Young <dyoung@nslu2-linux.org>
Date: Fri, 9 Sep 2005 03:15:48 +0000 (+0000)
Subject: merge of 6a15a634097b93cdeacbb88ce9518ce0bf5a945f
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0faa4ebc047d2d53595d0ca98b3d8902e4c18d46;p=openembedded.git

merge of 6a15a634097b93cdeacbb88ce9518ce0bf5a945f
     and e55a199a204af711c51f5c00ac2612d54f98edc2
---

0faa4ebc047d2d53595d0ca98b3d8902e4c18d46