From: Rod Whitby <rod@whitby.id.au>
Date: Mon, 28 Aug 2006 20:46:54 +0000 (+0000)
Subject: merge of 21e3aea015b4542ed27eb6230a8fba2f1c9b9889
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
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3173b7dc32a685638411bd6e27d42357e4b537a5;p=openembedded.git

merge of 21e3aea015b4542ed27eb6230a8fba2f1c9b9889
     and 66118fcaf02332902350af917b57b972df319ac9
---

3173b7dc32a685638411bd6e27d42357e4b537a5