From: Jeremy Laine <jeremy.laine@m4x.org>
Date: Tue, 6 May 2008 00:40:51 +0000 (+0000)
Subject: merge of '665b801ef26b2b5da6423ad9a47eac8ab53b6574'
X-Git-Tag: Release-2010-05/1~7019^2^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4037c4a087635e50671fee29182cde8e93708bd6;p=openembedded.git

Merge ... '665b801ef26b2b5da6423ad9a47eac8ab53b6574'
     and 'a26f0aa5e87dfafafddf0175fac360e6ab7b2174'
---

4037c4a087635e50671fee29182cde8e93708bd6