From: John Bowler <jbowler@nslu2-linux.org>
Date: Sun, 17 Jul 2005 04:19:24 +0000 (+0000)
Subject: merge of d3dcb0c356424f9ab47b293d423a45686bc79ba2
X-Git-Tag: Release-2010-05/1~9453^2~4138^2~3
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=bc134d03784a362afd235c916e3f34f440d71740;p=openembedded.git

merge of d3dcb0c356424f9ab47b293d423a45686bc79ba2
     and ef736222cb8bd5af85eb593d850cb17872dabfc8
---

bc134d03784a362afd235c916e3f34f440d71740