From: Rod Whitby <rod@whitby.id.au>
Date: Sat, 9 Sep 2006 07:01:30 +0000 (+0000)
Subject: merge of 02661077c56615b6f78a85ff37e8cf94cd9a3139
X-Git-Tag: Release-2010-05/1~9453^2~876^2~12^2~1
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=18107a92cbf28500c5ec927bac343772ab68d72a;p=openembedded.git

merge of 02661077c56615b6f78a85ff37e8cf94cd9a3139
     and 37a35d8b0c2c2c37d5624c388e4b3fb3abff6658
---

18107a92cbf28500c5ec927bac343772ab68d72a