From: Rod Whitby <rod@whitby.id.au>
Date: Fri, 29 Dec 2006 17:34:11 +0000 (+0000)
Subject: merge of 1a1cd1c2ecbe0712e9f54f87f4b4d4b4b659ad93
X-Git-Tag: Release-2010-05/1~9453^2~34^2~1^2~1^2~1^2~1^2^2^2^2^2^2^2^2~1^2^2^2~2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=fd95ba7059a9721227d1fbb1ac2ad7af0db72554;p=openembedded.git

merge of 1a1cd1c2ecbe0712e9f54f87f4b4d4b4b659ad93
     and 3a0737f44dbb17d4596e96658fc6d82df71f37ca
---

fd95ba7059a9721227d1fbb1ac2ad7af0db72554