From: Rod Whitby <rod@whitby.id.au>
Date: Wed, 16 Aug 2006 22:46:28 +0000 (+0000)
Subject: merge of 144fd340e011918ec9e2b22ebd9d65d1fc0bc371
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~4^2^2~2^2^2^2~1
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5dd15e2d6e22efc3a119d58d502fb6411af88635;p=openembedded.git

merge of 144fd340e011918ec9e2b22ebd9d65d1fc0bc371
     and 5b22925a7b123db5cb7c74c47b0d46e3a3510df6
---

5dd15e2d6e22efc3a119d58d502fb6411af88635