From: Rod Whitby <rod@whitby.id.au>
Date: Wed, 30 Aug 2006 08:46:11 +0000 (+0000)
Subject: merge of 14307187d5a69ad1edd7893f234dfed5e580e4e8
X-Git-Tag: Release-2010-05/1~9453^2~876^2~12^2~1^2~1^2^2^2~1^2^2~1^2^2^2~1^2^2~1^2^2^2^2~5^2~1^2^2~1^2^2~2^2~1^2^2^2^2~1^2~2^2^2~1^2^2^2^2~1^2~2^2^2~1^2^2~3^2^2~2^2~1
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7e85a4d1de9f95a1130f29659226a219c03e19bb;p=openembedded.git

merge of 14307187d5a69ad1edd7893f234dfed5e580e4e8
     and 16c6200929261d7ff2851ae9fa07f6fff6aa493f
---

7e85a4d1de9f95a1130f29659226a219c03e19bb