From: Rod Whitby <rod@whitby.id.au>
Date: Sun, 1 Apr 2007 21:59:44 +0000 (+0000)
Subject: merge of '15e084fa8118e1a49559b4193f626d0c5ad7cce0'
X-Git-Tag: Release-2010-05/1~8868^2~861^2~7
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=476e3ca683aa352acf1bc4b4eb5affb7f437ef27;p=openembedded.git

Merge ... '15e084fa8118e1a49559b4193f626d0c5ad7cce0'
     and '80791bbfbbfd682c0e16ebb739bfb7041451a1c1'
---

476e3ca683aa352acf1bc4b4eb5affb7f437ef27