From: Rod Whitby <rod@whitby.id.au>
Date: Thu, 24 Aug 2006 17:46:49 +0000 (+0000)
Subject: merge of 24283da3dc0742e26ebecf1a294d55e38821072e
X-Git-Tag: Release-2010-05/1~9453^2~878^2~2^2^2^2~2^2^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=62836749c727d92bcfccb1fee5317e8732c0ac1c;p=openembedded.git

merge of 24283da3dc0742e26ebecf1a294d55e38821072e
     and b3e0de23c7ab8937d191bde866a56304b99967df
---

62836749c727d92bcfccb1fee5317e8732c0ac1c