From: Philip Balister <philip@balister.org>
Date: Thu, 1 Mar 2007 00:24:34 +0000 (+0000)
Subject: merge of '90c07393f116dc9720db1a55b78192aaa456e97d'
X-Git-Tag: Release-2010-05/1~9133^2~13^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c53248f0f4f02f7da081b40a20c6fdcfd473c015;p=openembedded.git

Merge ... '90c07393f116dc9720db1a55b78192aaa456e97d'
     and '9523a6c49fea666d37483577cb42fb7042141993'
---

c53248f0f4f02f7da081b40a20c6fdcfd473c015