From: Philipp Zabel <philipp.zabel@gmail.com>
Date: Fri, 14 Jul 2006 12:22:41 +0000 (+0000)
Subject: merge of 78497884a0df59f27e3276d6961e46c6f09f7eb9
X-Git-Tag: Release-2010-05/1~9453^2~1229
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=343a8dc59cfd35bc8a30ac898e6644c859d988db;p=openembedded.git

merge of 78497884a0df59f27e3276d6961e46c6f09f7eb9
     and bf485b02c3a40cf5e773106c4aff28ebea2e1a2e
---

343a8dc59cfd35bc8a30ac898e6644c859d988db