From: Mike Westerhof <mwester@dls.net>
Date: Sun, 24 Aug 2008 23:55:23 +0000 (+0000)
Subject: merge of '7bd228fcb04f96a616bd3711f0d5df582a2a71ec'
X-Git-Tag: Release-2010-05/1~6251^2~3^2~1
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=69cd4b590282088c35967213d400e480150d43c8;p=openembedded.git

Merge ... '7bd228fcb04f96a616bd3711f0d5df582a2a71ec'
     and '87d13abecb09be358ba331b4193cf76bdd2bda3d'
---

69cd4b590282088c35967213d400e480150d43c8