From: Rod Whitby <rod@whitby.id.au>
Date: Wed, 6 Sep 2006 17:46:23 +0000 (+0000)
Subject: merge of 5c42f9ce62648e7c8f6308ada5e7d7d7eb900b36
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
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=57548f8b698d03443595a3fb1d1b4ca67709432b;p=openembedded.git

merge of 5c42f9ce62648e7c8f6308ada5e7d7d7eb900b36
     and 732243cdb95b781f5f8d025c92abbf0ef74ef436
---

57548f8b698d03443595a3fb1d1b4ca67709432b