From: Rod Whitby <rod@whitby.id.au>
Date: Thu, 27 Apr 2006 23:24:39 +0000 (+0000)
Subject: merge of 1e5d155bb4785e9650d4b05e4bae0c7c8a3ff11f
X-Git-Tag: Release-2010-05/1~9453^2~1751^2~24^2~12
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d602c21a168f2bfc79f5b5451b4614282f08c4b9;p=openembedded.git

merge of 1e5d155bb4785e9650d4b05e4bae0c7c8a3ff11f
     and d4fc38fb08cc643983acea4a5d23706a1aa08636
---

d602c21a168f2bfc79f5b5451b4614282f08c4b9