From: John Bowler <jbowler@nslu2-linux.org>
Date: Wed, 18 Jan 2006 07:59:50 +0000 (+0000)
Subject: merge of f32b2805c6ecb514661bd053c664684ab5f7323f
X-Git-Tag: Release-2010-05/1~9453^2~2628^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=022cad9938488cdc84511658fb112b73b7605c82;p=openembedded.git

merge of f32b2805c6ecb514661bd053c664684ab5f7323f
     and b78c38c1ca7715097407f79c1f432372e7b8c258
---

022cad9938488cdc84511658fb112b73b7605c82