From: Rod Whitby <rod@whitby.id.au>
Date: Mon, 21 Aug 2006 12:01:03 +0000 (+0000)
Subject: merge of a85d84719f5199301ef74c686bc2d290de30308d
X-Git-Tag: Release-2010-05/1~9453^2~878^2~2^2^2^2~2^2^2~1^2~1^2^2~4
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=628a1f086e8c0416db11bd08cbbc789b4f1443cd;p=openembedded.git

merge of a85d84719f5199301ef74c686bc2d290de30308d
     and e5fc9068f8cf1cbab5a9388e11725f13093edecf
---

628a1f086e8c0416db11bd08cbbc789b4f1443cd