From: John Bowler <jbowler@nslu2-linux.org>
Date: Fri, 12 Aug 2005 18:37:52 +0000 (+0000)
Subject: merge of 23548cd42cadf3483cc0fe532a297853c7daaaa4
X-Git-Tag: Release-2010-05/1~9453^2~3916
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5a32047fe2abb4ecf7129e7dcc1c7f844c1f9296;p=openembedded.git

merge of 23548cd42cadf3483cc0fe532a297853c7daaaa4
     and 96b1952909f0144eb869df86e47875a3d3e8abd2
---

5a32047fe2abb4ecf7129e7dcc1c7f844c1f9296