From: John Bowler <jbowler@nslu2-linux.org>
Date: Tue, 29 Nov 2005 17:53:31 +0000 (+0000)
Subject: merge of 067348788424405023bc8971f401fd647ff123d2
X-Git-Tag: Release-2010-05/1~9453^2~2960^2^2~9^2~2^2~3^2^2~3
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8700a39faa54abf5b564db7467a6b8d31ffca988;p=openembedded.git

merge of 067348788424405023bc8971f401fd647ff123d2
     and 7436e5bd502644f73a27f1d58324cbe48bccb511
---

8700a39faa54abf5b564db7467a6b8d31ffca988