From: Philipp Zabel <philipp.zabel@gmail.com>
Date: Thu, 29 Mar 2007 09:03:44 +0000 (+0000)
Subject: merge of '1e8faa4701311b4c11fce9ad2aaef0fd6ae13561'
X-Git-Tag: Release-2010-05/1~8868^2~944
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e2090647014fc0efe067f38b84e8369e61859fe9;p=openembedded.git

Merge ... '1e8faa4701311b4c11fce9ad2aaef0fd6ae13561'
     and 'ec509c3d471398d22393a140ab3979247c0a566c'
---

e2090647014fc0efe067f38b84e8369e61859fe9