From: Philipp Zabel <philipp.zabel@gmail.com>
Date: Sat, 31 Mar 2007 19:09:52 +0000 (+0000)
Subject: merge of 'a4c123e0e153d70e8abbfebd4ae1f8275c9fb4a1'
X-Git-Tag: Release-2010-05/1~8868^2~875
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a678d46d460a13d7d74f8b17be46018613f51ee6;p=openembedded.git

Merge ... 'a4c123e0e153d70e8abbfebd4ae1f8275c9fb4a1'
     and 'cd09ce621aa0ddff8436a7dc27250ade56d36571'
---

a678d46d460a13d7d74f8b17be46018613f51ee6