From: Rod Whitby <rod@whitby.id.au>
Date: Thu, 21 Jun 2007 08:08:44 +0000 (+0000)
Subject: merge of '9a039e377450d290fde23e8f83821bd022343fd4'
X-Git-Tag: Release-2010-05/1~8868^2~261^2~27^2~34^2~2^2~5
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a0d73989b7d018637ae2f5bf78809c1e92c9c80d;p=openembedded.git

Merge ... '9a039e377450d290fde23e8f83821bd022343fd4'
     and 'f325de22a31b0cf688674dfc96bed863bdeb049d'
---

a0d73989b7d018637ae2f5bf78809c1e92c9c80d