From: John Bowler <jbowler@nslu2-linux.org>
Date: Sun, 14 Aug 2005 18:00:44 +0000 (+0000)
Subject: merge of a43a3081d043237ce284af591c69b35171e746be
X-Git-Tag: Release-2010-05/1~9453^2~3858^2~26
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=116dddad4ec038b7d4322f8201556e6cf420fb96;p=openembedded.git

merge of a43a3081d043237ce284af591c69b35171e746be
     and b91f743ce475bca1b138c7fd63260e83a34f53c2
---

116dddad4ec038b7d4322f8201556e6cf420fb96