From: OpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Date: Thu, 29 May 2008 04:42:19 +0000 (+0000)
Subject: merge of '318660b8f7240f5e784cdaa0a4b9048cf6216703'
X-Git-Tag: Release-2010-05/1~6842^2~11^2~24
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=abd25c0dce4a42a778f31cb7a560d3fc25e5f083;p=openembedded.git

Merge ... '318660b8f7240f5e784cdaa0a4b9048cf6216703'
     and '9a7b1dbe287eb9e4b90026bdaca80bbeaeef126b'
---

abd25c0dce4a42a778f31cb7a560d3fc25e5f083