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

merge of 86df0fa5453f58a329ab8d611e13758477cde6e1
     and df5bebb5f7901cf544fc06f6a706114231faa7c8
---

f27f73a2205a3822bcac055460afc44680248021