From: John Bowler <jbowler@nslu2-linux.org>
Date: Mon, 24 Oct 2005 18:58:37 +0000 (+0000)
Subject: merge of 7961785499462b0a3444277448e496a1efd6deda
X-Git-Tag: Release-2010-05/1~9453^2~3207
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e4919a25772c05d236298b5a74b78ae69f5c2933;p=openembedded.git

merge of 7961785499462b0a3444277448e496a1efd6deda
     and f0e6ce1b155a55c7168f73ae67524b654d95aa8b
---

e4919a25772c05d236298b5a74b78ae69f5c2933