From: John Bowler <jbowler@nslu2-linux.org>
Date: Fri, 28 Oct 2005 05:18:58 +0000 (+0000)
Subject: merge of 749a74b807f23c00b9560c4ea5e45c3bdd945ae9
X-Git-Tag: Release-2010-05/1~9453^2~3174
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d4fe48e910d486f6e2d7216544ef9b71a07d5a6f;p=openembedded.git

merge of 749a74b807f23c00b9560c4ea5e45c3bdd945ae9
     and d5f672b215553b0622c8ee9a8ee627e900ab92e4
---

d4fe48e910d486f6e2d7216544ef9b71a07d5a6f