From: Rod Whitby <rod@whitby.id.au>
Date: Fri, 30 Mar 2007 13:06:17 +0000 (+0000)
Subject: merge of '5075b3f69144c8ca977abda48869d41f724d1334'
X-Git-Tag: Release-2010-05/1~8868^2~875^2~10^2~1
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e08e3ade3ba25fa5ef6b266343a5757c5819877c;p=openembedded.git

Merge ... '5075b3f69144c8ca977abda48869d41f724d1334'
     and 'aa4ab028a887106c3acd17349f4957692343e352'
---

e08e3ade3ba25fa5ef6b266343a5757c5819877c