From: Rod Whitby <rod@whitby.id.au>
Date: Sat, 2 Jun 2007 04:34:27 +0000 (+0000)
Subject: merge of '8da4b29315492cea3cf8257b50f8aabbea6d6928'
X-Git-Tag: Release-2010-05/1~8868^2~400^2~99^2
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=45640ab8b868f64b74e69ca195ede09067b35aed;p=openembedded.git

Merge ... '8da4b29315492cea3cf8257b50f8aabbea6d6928'
     and '9ce0fac11dc2febbff47bfcef92bd21fdb23732e'
---

45640ab8b868f64b74e69ca195ede09067b35aed