From: Rod Whitby <rod@whitby.id.au>
Date: Tue, 29 Aug 2006 12:01:15 +0000 (+0000)
Subject: merge of 01ea9bb518cc745e8d29558c0bf3e1836a903605
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~1^2~2^2^2~1^2^2^2^2~1^2~2^2^2~1^2^2~3^2^2~2^2~2^2~1^2~2^2^2^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0bd37ed65534fe7d3ce204c1de3778baf90e6853;p=openembedded.git

merge of 01ea9bb518cc745e8d29558c0bf3e1836a903605
     and 66f4e0ab9111d2b6004a362cd4ce9ada04063719
---

0bd37ed65534fe7d3ce204c1de3778baf90e6853