From: Rod Whitby <rod@whitby.id.au>
Date: Fri, 25 Aug 2006 10:17:01 +0000 (+0000)
Subject: merge of 15617f31c93e5e7e35627af8b363148f69541579
X-Git-Tag: Release-2010-05/1~9453^2~837^2~1^2^2~1^2~3^2~1^2~1^2^2^2^2^2^2~2^2^2~1
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c03d64972247a0433b2052b217e376dba394ec45;p=openembedded.git

merge of 15617f31c93e5e7e35627af8b363148f69541579
     and 6651fb704192756bf7c80d213d5cb1e48a1541dd
---

c03d64972247a0433b2052b217e376dba394ec45