From: John Bowler <jbowler@nslu2-linux.org>
Date: Mon, 6 Feb 2006 01:32:08 +0000 (+0000)
Subject: merge of cf839618d6d1e2c970c9b85fa8849fcbeaafb8d4
X-Git-Tag: Release-2010-05/1~9453^2~2429^2~1^2~1^2~1
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=409650382870711fda497f6d31e590f254a67f59;p=openembedded.git

merge of cf839618d6d1e2c970c9b85fa8849fcbeaafb8d4
     and fe9207286fe795f141cfced1550795b360e1e971
---

409650382870711fda497f6d31e590f254a67f59