From: Rod Whitby <rod@whitby.id.au>
Date: Fri, 14 Apr 2006 23:22:16 +0000 (+0000)
Subject: merge of 7e6d5167b862ccf180c98f2c1b1373bdd8fdd65f
X-Git-Tag: Release-2010-05/1~9453^2~1899
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0addba49b257008c63a9c64beafd1778bd0c70f8;p=openembedded.git

merge of 7e6d5167b862ccf180c98f2c1b1373bdd8fdd65f
     and f230ea166fd00577cf73bcb2cb81ab9767e16d4c
---

0addba49b257008c63a9c64beafd1778bd0c70f8