From: Rod Whitby <rod@whitby.id.au>
Date: Wed, 11 Apr 2007 22:15:00 +0000 (+0000)
Subject: merge of '25889b95fd1b6dbf67f1c12c4b431ef3b5f56abd'
X-Git-Tag: Release-2010-05/1~8868^2~704
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1a3874e8cc304feadc7017304e3556303a22e333;p=openembedded.git

Merge ... '25889b95fd1b6dbf67f1c12c4b431ef3b5f56abd'
     and '4d324c4c89d578bda06062c61207aa2b7ff6e41f'
---

1a3874e8cc304feadc7017304e3556303a22e333