From: Rod Whitby <rod@whitby.id.au>
Date: Thu, 20 Sep 2007 00:21:25 +0000 (+0000)
Subject: merge of '59ac76a98d175728e06d1a85a9533570b68cfad7'
X-Git-Tag: Release-2010-05/1~8616^2^2^2^2^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e40945c549e702290ff2df835771d4145786734d;p=openembedded.git

Merge ... '59ac76a98d175728e06d1a85a9533570b68cfad7'
     and 'b78f2dc352e2e9c1e3c7c2020293e603d6c2a7b8'
---

e40945c549e702290ff2df835771d4145786734d