From: John Bowler <jbowler@nslu2-linux.org>
Date: Thu, 6 Oct 2005 06:42:07 +0000 (+0000)
Subject: merge of 0d6d444e1b9f86d0b1f42ce130e9287440bd927f
X-Git-Tag: Release-2010-05/1~9453^2~3348
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=50c30aac02764438f18b3deda6113f25bbb36533;p=openembedded.git

merge of 0d6d444e1b9f86d0b1f42ce130e9287440bd927f
     and 3caeeb678d5bcfbb3e40443c54864cf7f7a3f44a
---

50c30aac02764438f18b3deda6113f25bbb36533