From: John Bowler <jbowler@nslu2-linux.org>
Date: Sat, 30 Jul 2005 21:00:58 +0000 (+0000)
Subject: merge of 8b8120727862804deb9f2a39e3783ab361641903
X-Git-Tag: Release-2010-05/1~9453^2~4005^2~18^2~8^2~1
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=fd532f27ab2d9f23308b2e72fda716ae85f31179;p=openembedded.git

merge of 8b8120727862804deb9f2a39e3783ab361641903
     and a20db40eaf050a3896e2642e9b129605dc631d4c
---

fd532f27ab2d9f23308b2e72fda716ae85f31179