From: Rod Whitby <rod@whitby.id.au>
Date: Mon, 1 Jan 2007 02:32:26 +0000 (+0000)
Subject: merge of 67bd39f2857c8d500ea6587f646708b1cf8072af
X-Git-Tag: Release-2010-05/1~9453^2~34^2~1^2~1^2~1^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=93ae244431e521af430d5e97a7a7e4b710ad064f;p=openembedded.git

merge of 67bd39f2857c8d500ea6587f646708b1cf8072af
     and c45af8aecda431cfd0b08ac44631f5066955303b
---

93ae244431e521af430d5e97a7a7e4b710ad064f