From: Rod Whitby <rod@whitby.id.au>
Date: Tue, 28 Mar 2006 20:44:34 +0000 (+0000)
Subject: merge of 42fa354b672b23377813b6b278bf06236f7125ac
X-Git-Tag: Release-2010-05/1~9453^2~2102^2~49
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8adb4fc8e5f9a1eb0cb174dd6a846a8ee7edd3fb;p=openembedded.git

merge of 42fa354b672b23377813b6b278bf06236f7125ac
     and 7fb75dee044e15146c4486204f08a3d8b6f70c49
---

8adb4fc8e5f9a1eb0cb174dd6a846a8ee7edd3fb