From: Rod Whitby <rod@whitby.id.au>
Date: Fri, 7 Sep 2007 17:15:39 +0000 (+0000)
Subject: merge of '3b618e174a1bdef0e2e2e2fe1efddadb3d3ce48d'
X-Git-Tag: Release-2010-05/1~8701^2~8^2~1
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=192c2604585e38edd32a51432bbe6ae16a31cc00;p=openembedded.git

Merge ... '3b618e174a1bdef0e2e2e2fe1efddadb3d3ce48d'
     and '453784163e85d585c492f5db88b0fcbc9a68b398'
---

192c2604585e38edd32a51432bbe6ae16a31cc00