From: Rod Whitby <rod@whitby.id.au>
Date: Sat, 28 Apr 2007 02:43:01 +0000 (+0000)
Subject: merge of '4b1104995a63f0dbc8e77f81187ca99b59678c01'
X-Git-Tag: Release-2010-05/1~8868^2~261^2~27^2~34^2~2^2~5^2^2^2~1^2~2^2^2~2^2^2~6^2^2~1^2~1^2^2~1^2^2^2^2~4
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=efeef9871fc6985f0638a8364a3634be0b6aec6e;p=openembedded.git

Merge ... '4b1104995a63f0dbc8e77f81187ca99b59678c01'
     and 'e1f39a9d05343b3bb1b72d9e08bfe0c7fd20b15b'
---

efeef9871fc6985f0638a8364a3634be0b6aec6e