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

merge of 4d9a5bbe5c65fe086c07e88aa353ead3d2d311ab
     and a085bb7a7d5ec61683fc1c0366fb37bcceaa8669
---

e0404913cd9f693af87ee2f90c5fc87a55bc04ee