From: Rod Whitby <rod@whitby.id.au>
Date: Sun, 20 Aug 2006 21:46:29 +0000 (+0000)
Subject: merge of 27ccadac8de1a506e26898f5e97c53a9b9bcb534
X-Git-Tag: Release-2010-05/1~9453^2~878^2~2^2^2^2~2^2^2~1^2~1^2^2~5^2^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1672ad65f495899227d8841e975bc4b6d5dee19f;p=openembedded.git

merge of 27ccadac8de1a506e26898f5e97c53a9b9bcb534
     and 4f1b5f1876e0bbd495ee093807430903eb190558
---

1672ad65f495899227d8841e975bc4b6d5dee19f