From: Philip Balister <philip@balister.org>
Date: Mon, 3 Dec 2007 12:00:28 +0000 (+0000)
Subject: merge of '4b48cc331d56f5ee9714871633ccb98a1cfe28e1'
X-Git-Tag: Release-2010-05/1~8236^2~7^2~3^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4c12de840646dd2ff12ddcba9663717e9387a28f;p=openembedded.git

Merge ... '4b48cc331d56f5ee9714871633ccb98a1cfe28e1'
     and '9e08f0a0ea353d01da3e8da16012b96b9e4e2fa2'
---

4c12de840646dd2ff12ddcba9663717e9387a28f