From: John Bowler <jbowler@nslu2-linux.org>
Date: Tue, 2 Aug 2005 00:39:10 +0000 (+0000)
Subject: merge of a0c6e9d622b3b7fa68f6ed104d4006492634cb1d
X-Git-Tag: Release-2010-05/1~9453^2~4014^2~5
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=471d4c7a1a8d509f8bbd71b78fcdd0ab31427547;p=openembedded.git

merge of a0c6e9d622b3b7fa68f6ed104d4006492634cb1d
     and d5ca2d9089d0a71c3f006b3ef5b5a276d383f1c1
---

471d4c7a1a8d509f8bbd71b78fcdd0ab31427547