From: Rod Whitby <rod@whitby.id.au>
Date: Fri, 18 Aug 2006 14:46:06 +0000 (+0000)
Subject: merge of a05ce2cbb8b0534ea1033d1d848c29650132ebc1
X-Git-Tag: Release-2010-05/1~9453^2~878^2~2^2^2^2~2^2^2~1^2~1^2^2~5^2^2^2~2^2^2~5^2^2~2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6d9291518580c75136be4c72e0d761cf5572eb27;p=openembedded.git

merge of a05ce2cbb8b0534ea1033d1d848c29650132ebc1
     and b60b9cbd9811d42fdfd03aae3fb9d35d428d7ddc
---

6d9291518580c75136be4c72e0d761cf5572eb27