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

Merge ... '33512049e02cf7c8e5bd9b457c06f88047a373bb'
     and '338a4c3a2eeb15c49e9ff9d0d90fb71ab1ddad3a'
---

3f125a902b4453c2832a5b91a0f8290519062769