From: Rod Whitby <rod@whitby.id.au>
Date: Sun, 3 Sep 2006 22:16:36 +0000 (+0000)
Subject: merge of 688adfee85a259aa7c8d509449ef062c0b6aa923
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
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ee7e70e91badd8d7006e578b215f20c75a92689e;p=openembedded.git

merge of 688adfee85a259aa7c8d509449ef062c0b6aa923
     and f1283b897469ab024842df137e48790f1c8e37f4
---

ee7e70e91badd8d7006e578b215f20c75a92689e