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

merge of 2b9450c3581604419a5aecf3261b55f4f47ea6d1
     and 42be14012b6790df46c62295f3a02286acecbd4f
---

bda11d14f5beb30bc9f0d8303646297f8f3e65f2