From: John Bowler <jbowler@nslu2-linux.org>
Date: Tue, 1 Nov 2005 15:26:40 +0000 (+0000)
Subject: merge of 56c4ad3f8bd89081f85f57b468371c5550c5ac02
X-Git-Tag: Release-2010-05/1~9453^2~3154
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8b8b59d12e2970dfb10ee939c06283a553d24571;p=openembedded.git

merge of 56c4ad3f8bd89081f85f57b468371c5550c5ac02
     and ea663319603d7cd9a809a14f32a31e0f4dfc5f0c
---

8b8b59d12e2970dfb10ee939c06283a553d24571