From: Rod Whitby <rod@whitby.id.au>
Date: Sat, 2 Sep 2006 00:04:58 +0000 (+0000)
Subject: merge of 04a614aaf2494f9969f8d456330c108c6cce3b2b
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
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d90f41da208ca1aec3b3b1e214e91381f4b1bcc1;p=openembedded.git

merge of 04a614aaf2494f9969f8d456330c108c6cce3b2b
     and 0f6969d4ead4e00cd7af790f83f9ae1860433891
---

d90f41da208ca1aec3b3b1e214e91381f4b1bcc1