From: Philip Balister <philip@balister.org>
Date: Tue, 16 Jan 2007 14:00:39 +0000 (+0000)
Subject: merge of '3de88634fec14dacb930fd0e1946c97f51c4b9e2'
X-Git-Tag: Release-2010-05/1~9363
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=16cb2f321befd4c69c9c938c2ec8386fcfb3336a;p=openembedded.git

Merge ... '3de88634fec14dacb930fd0e1946c97f51c4b9e2'
     and '97ab5b547fe9949119532579fc794b04c0806389'
---

16cb2f321befd4c69c9c938c2ec8386fcfb3336a