From: John Bowler <jbowler@nslu2-linux.org>
Date: Sun, 5 Feb 2006 06:10:45 +0000 (+0000)
Subject: merge of 972552ee20c9c9c79e01afea5f9276b5e4c554bd
X-Git-Tag: Release-2010-05/1~9453^2~2456^2~1
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2e73052fdbcb7b374e823cda25503a7a10dbc69d;p=openembedded.git

merge of 972552ee20c9c9c79e01afea5f9276b5e4c554bd
     and d17c8965045bca1d838e85c0b4579217b647682c
---

2e73052fdbcb7b374e823cda25503a7a10dbc69d