From: Rod Whitby <rod@whitby.id.au>
Date: Fri, 1 Jun 2007 11:57:14 +0000 (+0000)
Subject: merge of '1d9935b3e0d35c7a46a12ff9b1eb110e025a91a7'
X-Git-Tag: Release-2010-05/1~8868^2~400^2~99^2^2
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f0ddb45d57fb673c85446782d9a1d5322131f4f0;p=openembedded.git

Merge ... '1d9935b3e0d35c7a46a12ff9b1eb110e025a91a7'
     and '9449fb8db47002bf509ae8e6f5918ea716044c62'
---

f0ddb45d57fb673c85446782d9a1d5322131f4f0