From: John Bowler <jbowler@nslu2-linux.org>
Date: Sat, 2 Jul 2005 01:57:20 +0000 (+0000)
Subject: merge of 8e63001b71c44d7180fad5cb696c1f236ca499bf
X-Git-Tag: Release-2010-05/1~9453^2~4256^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a28a4ef535221081707137c3922380fe9c642e31;p=openembedded.git

merge of 8e63001b71c44d7180fad5cb696c1f236ca499bf
     and e09ea609ebc72b9df978eaedae828cd360c843f9
---

a28a4ef535221081707137c3922380fe9c642e31