From: Philip Balister <philip@balister.org>
Date: Fri, 20 Oct 2006 19:01:21 +0000 (+0000)
Subject: merge of '143fecd103b7ad42c619a91d888c8b7e3b7f8fb3'
X-Git-Tag: Release-2010-05/1~9453^2~567^2~71^2^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4efda0e0f2a5728abd931d0f40f5df7ce80966bb;p=openembedded.git

Merge ... '143fecd103b7ad42c619a91d888c8b7e3b7f8fb3'
     and '97021a57e23ad3769708efc11bbfd4f366f29d24'
---

4efda0e0f2a5728abd931d0f40f5df7ce80966bb