From: Philip Balister <philip@balister.org>
Date: Sun, 12 Aug 2007 23:15:12 +0000 (+0000)
Subject: merge of '65fb29ae308602940228134ed6cbae42627b7c1e'
X-Git-Tag: Release-2010-05/1~8999
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=21abeeb94455504cbac2afdf6cab600dadd44bca;p=openembedded.git

Merge ... '65fb29ae308602940228134ed6cbae42627b7c1e'
     and 'a3c9cfee8bbd98b2f5deca23d7508e6f6dca407b'
---

21abeeb94455504cbac2afdf6cab600dadd44bca