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

merge of 4844115704ef8669d1a44359d8e2f4aea0f4e0a3
     and c24a3542dea96cfac7343e6b921684d6459008da
---

a0097aa2e676041ec78482bbfe721d31dddca6aa