From: Rod Whitby <rod@whitby.id.au>
Date: Mon, 18 Dec 2006 19:48:32 +0000 (+0000)
Subject: merge of 06a1855a43c924a4f7630ca044ddffc956844d7c
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^2~2^2~6^2^2~1^2^2^2^2~6^2~2^2~1
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8cfabcd5f4ae9ccd39bdf84c7e80475a6f13c8a2;p=openembedded.git

merge of 06a1855a43c924a4f7630ca044ddffc956844d7c
     and fe7f09c0ab220b629fe9a568245cfe155bbeb443
---

8cfabcd5f4ae9ccd39bdf84c7e80475a6f13c8a2