From: Phil Blundell <philb@gnu.org>
Date: Sun, 3 Aug 2008 11:14:32 +0000 (+0000)
Subject: merge of '1e7e45502df6c52d725444e6655b368305ffe8d6'
X-Git-Tag: Release-2010-05/1~6375^2~2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d0fcd141d88e40de07c6539f7735f4983a1eea5f;p=openembedded.git

Merge ... '1e7e45502df6c52d725444e6655b368305ffe8d6'
     and '6690ff49b103de5f60ddc09faaed43726adb4506'
---

d0fcd141d88e40de07c6539f7735f4983a1eea5f