From: Philip Balister <philip@balister.org>
Date: Thu, 12 Apr 2007 12:05:52 +0000 (+0000)
Subject: merge of 'd253693f9ba8535d5eb55f96bdfd2b50531cfa16'
X-Git-Tag: Release-2010-05/1~8868^2~699
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=02513c0bd3d3171ceb71d9c77fb0c078cbc70d9e;p=openembedded.git

Merge ... 'd253693f9ba8535d5eb55f96bdfd2b50531cfa16'
     and 'e006153174fed88db5828cf33bf4c76a78595dc5'
---

02513c0bd3d3171ceb71d9c77fb0c078cbc70d9e