From: Rod Whitby <rod@whitby.id.au>
Date: Tue, 22 Aug 2006 16:32:19 +0000 (+0000)
Subject: merge of 042c3e43aecabe7f5d5eaa92b66e4bcb9378669a
X-Git-Tag: Release-2010-05/1~9453^2~878^2~2^2^2^2~2^2^2~1^2~1^2^2~3
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5aa2cba9f72a9095b20acad4bb8b624b9f172b0c;p=openembedded.git

merge of 042c3e43aecabe7f5d5eaa92b66e4bcb9378669a
     and 7bf39cf992a3dbe062066db3100333fa62967447
---

5aa2cba9f72a9095b20acad4bb8b624b9f172b0c