From: Rod Whitby <rod@whitby.id.au>
Date: Fri, 15 Dec 2006 05:47:24 +0000 (+0000)
Subject: merge of 9f17bb47e7899a5664c31edd5c6e25de8b4ef19f
X-Git-Tag: Release-2010-05/1~9453^2~27^2~11^2~2^2^2^2^2~3^2^2^2^2^2~2^2~2^2~6^2^2~1^2^2^2^2~6^2~2^2~2^2~1^2~1^2~1^2^2^2^2^2~1^2^2^2^2^2~4^2~2^2~3^2^2~1
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a620c4808b740927e35e9d60ba8dc4f7f698a8e3;p=openembedded.git

merge of 9f17bb47e7899a5664c31edd5c6e25de8b4ef19f
     and b9b45bf7b9d31aacbebec45402ce946c76e6c620
---

a620c4808b740927e35e9d60ba8dc4f7f698a8e3