From: John Bowler <jbowler@nslu2-linux.org>
Date: Thu, 4 Aug 2005 16:56:45 +0000 (+0000)
Subject: merge of 4f25673bce4a4b71f224f593c0e8891b8d43b7a5
X-Git-Tag: Release-2010-05/1~9453^2~3996^2
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=319f88ac01cb5cb3ec90a088705e16c30c686d06;p=openembedded.git

merge of 4f25673bce4a4b71f224f593c0e8891b8d43b7a5
     and 9525011e1445925b5fb6a335db59a38e8e753ecf
---

319f88ac01cb5cb3ec90a088705e16c30c686d06