From: John Bowler <jbowler@nslu2-linux.org>
Date: Fri, 1 Jul 2005 02:10:24 +0000 (+0000)
Subject: merge of 541dc5976410d780e5918ffaf19fc9e2e17e40cc
X-Git-Tag: Release-2010-05/1~9453^2~4256^2~9
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=69eadb671ec76da36d35e3e83cd5020ce78da0c7;p=openembedded.git

merge of 541dc5976410d780e5918ffaf19fc9e2e17e40cc
     and de56403f43f1ceeaffcfca380aff23d0c1426036
---

69eadb671ec76da36d35e3e83cd5020ce78da0c7