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

merge of 08158e66a13b9f88a9a08e7326a67afcbd847d7c
     and a6a7567999a923a8c91f1ad6b0a4b5bc6751dec0
---

9d85be63b1c18fb4d2261f28b5195297423c34d0