From: Rod Whitby <rod@whitby.id.au>
Date: Sun, 27 Aug 2006 08:46:01 +0000 (+0000)
Subject: merge of 3ff0f8f7983a202ace4e75e21b8d046ed96e86cf
X-Git-Tag: Release-2010-05/1~9453^2~837^2~1^2^2~1^2~3^2~1
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ca2fa35ad90c42e988b2824edaa4069e68492a5b;p=openembedded.git

merge of 3ff0f8f7983a202ace4e75e21b8d046ed96e86cf
     and 55d5ad2a2f0d7c7dbb9b6c12407c6346e57b5cca
---

ca2fa35ad90c42e988b2824edaa4069e68492a5b