From: Tom King <ka6sox@nslu2-linux.org>
Date: Sun, 21 Aug 2005 00:49:53 +0000 (+0000)
Subject: merge of 47c741e249fa9fd872ab3d835c3c5b28a6897aae
X-Git-Tag: Release-2010-05/1~9453^2~3873^2~1
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4be7b3f39dfdc93304208fa04cdf3cd012534a84;p=openembedded.git

merge of 47c741e249fa9fd872ab3d835c3c5b28a6897aae
     and 736b526a3d88e624bef7169dd8ff31366f58593f
---

4be7b3f39dfdc93304208fa04cdf3cd012534a84