From: Rod Whitby <rod@whitby.id.au>
Date: Mon, 1 Jan 2007 23:19:16 +0000 (+0000)
Subject: merge of 78778155572656a77b8d6701c0de1a1d44e81164
X-Git-Tag: Release-2010-05/1~9453^2~35^2~2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=861682a49c820ba499285cdce0a9dbd355d252c6;p=openembedded.git

merge of 78778155572656a77b8d6701c0de1a1d44e81164
     and 85152a9924438ef00b0d3a9faed2445ed208dfe2
---

861682a49c820ba499285cdce0a9dbd355d252c6