From: Rod Whitby <rod@whitby.id.au>
Date: Thu, 13 Apr 2006 19:36:24 +0000 (+0000)
Subject: merge of 0b5d6ed48b6bbd6c6c562be67f6b8f51f55433c0
X-Git-Tag: Release-2010-05/1~9453^2~1954^2~12
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c69c2e03ced0bf4fcbfcf388c6e3538eb75df92f;p=openembedded.git

merge of 0b5d6ed48b6bbd6c6c562be67f6b8f51f55433c0
     and cf432acec69f2b77b5f85cd8f610464a164f2251
---

c69c2e03ced0bf4fcbfcf388c6e3538eb75df92f