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

merge of 0f5fc910a03052e7b935c22cf24e1235f9cc1576
     and 148128e51132bed7d8e3039fac94e08c23e74d6c
---

dd9fdd00c5aafb38176863d4495b68d6e734dfcd