From: Rod Whitby <rod@whitby.id.au>
Date: Sun, 3 Jun 2007 03:22:33 +0000 (+0000)
Subject: merge of '11eb8250bfa94e5d9ef52ed609d121a21f783e98'
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~3
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8e29eb87d02b5fe34917a3ac2245bc9217cc8105;p=openembedded.git

Merge ... '11eb8250bfa94e5d9ef52ed609d121a21f783e98'
     and 'c6559ceba5987d7142c9759ae7f895632ac3b712'
---

8e29eb87d02b5fe34917a3ac2245bc9217cc8105