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

merge of 9c6d2f9ed3be4745760b4dcd14811587f4acd623
     and b4a513218154eb17b59ed896ac7e0037ab11fc14
---

2db17c741de71cc34e26130d1e23391f06beaaa1