From: Rod Whitby <rod@whitby.id.au>
Date: Thu, 21 Dec 2006 15:35:13 +0000 (+0000)
Subject: merge of 4ef7d8284f0d97d988fd30fed264146c8f80a8f9
X-Git-Tag: Release-2010-05/1~9453^2~27^2~11^2~2^2^2^2^2~3^2^2^2^2^2~2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=494dc55886d126d227007299673b26f18491b70d;p=openembedded.git

merge of 4ef7d8284f0d97d988fd30fed264146c8f80a8f9
     and b9f3335735a096f0257f25478a5ccd62c0c7c33f
---

494dc55886d126d227007299673b26f18491b70d