From: John Bowler <jbowler@nslu2-linux.org>
Date: Mon, 18 Jul 2005 21:43:11 +0000 (+0000)
Subject: merge of 0c0e42d7342579eb1ee491a6b8a0a8610fe644c5
X-Git-Tag: Release-2010-05/1~9453^2~4131
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=bdc0886ca344263cd06be258cffaf2bbc66532db;p=openembedded.git

merge of 0c0e42d7342579eb1ee491a6b8a0a8610fe644c5
     and e02ee9b6b5e60c69a2a2ea80c0f196cf79009da7
---

bdc0886ca344263cd06be258cffaf2bbc66532db