From: Leon Woestenberg <leon.woestenberg@gmail.com>
Date: Sun, 6 May 2007 15:33:37 +0000 (+0000)
Subject: merge of '61b65ffb0a858399f89407df40b6469b203bda44'
X-Git-Tag: Release-2010-05/1~8868^2~627
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7c8380efe7ac5b7d7aaf01f91599bb5e64542710;p=openembedded.git

Merge ... '61b65ffb0a858399f89407df40b6469b203bda44'
     and 'ed3f0331cfddd29d423591aa25379dc841a37572'
---

7c8380efe7ac5b7d7aaf01f91599bb5e64542710