From: Phil Blundell <philb@gnu.org>
Date: Sun, 13 Aug 2006 14:00:45 +0000 (+0000)
Subject: merge of '395d8c1ab96c40659f7304c72a28982ec1a4f0f9'
X-Git-Tag: Release-2010-05/1~9453^2~960
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4cfad8714d3f50c6c1a1808e9bdd8ddca72ea64b;p=openembedded.git

Merge ... '395d8c1ab96c40659f7304c72a28982ec1a4f0f9'
     and 'fb1f22c1f370716bb4047f4959e9a5babc1f47f8'
---

4cfad8714d3f50c6c1a1808e9bdd8ddca72ea64b