From: Philip Balister <philip@balister.org>
Date: Tue, 3 Apr 2007 18:45:29 +0000 (+0000)
Subject: merge of '471d0bd939972db8b9765eaaae30b43f2001abac'
X-Git-Tag: Release-2010-05/1~8868^2~820^2
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0b5f95edc5d8804a1e50f6c034bec5e11fe7edad;p=openembedded.git

Merge ... '471d0bd939972db8b9765eaaae30b43f2001abac'
     and '58149b1fe0252d2c717650db13dfa418e62af3de'
---

0b5f95edc5d8804a1e50f6c034bec5e11fe7edad