From: Rod Whitby <rod@whitby.id.au>
Date: Wed, 6 Sep 2006 19:31:32 +0000 (+0000)
Subject: merge of 337cfe2dd7c694a21c34148c5094a3ab6d4f6b8f
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
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f418b86789fc693afb28c17f21d33e2a4706d06d;p=openembedded.git

merge of 337cfe2dd7c694a21c34148c5094a3ab6d4f6b8f
     and ee12cb9ed2318aec0aa9342a44994a5027816c9d
---

f418b86789fc693afb28c17f21d33e2a4706d06d