From: Rod Whitby <rod@whitby.id.au>
Date: Sun, 3 Sep 2006 03:01:20 +0000 (+0000)
Subject: merge of 105eb7735e9ddc684333ac3d1ab62479d4ca672d
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
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9eb93329c334ae755bd4941ca44434de9eb98ad8;p=openembedded.git

merge of 105eb7735e9ddc684333ac3d1ab62479d4ca672d
     and ff7b9f5ef2329b56356a8adcbf70e4c4e9a3ecdb
---

9eb93329c334ae755bd4941ca44434de9eb98ad8