From: Philipp Zabel <philipp.zabel@gmail.com>
Date: Tue, 30 Aug 2005 18:35:29 +0000 (+0000)
Subject: merge of 1c3f5d84b51552d7b6e9729979f4fd8da7deceb1
X-Git-Tag: Release-2010-05/1~9453^2~3678^2~5
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3a8a72fef9bc4a241f536ffbb50cdd1928215754;p=openembedded.git

merge of 1c3f5d84b51552d7b6e9729979f4fd8da7deceb1
     and bf33034c282dd64819d4e41c15ee67d96dd56337
---

3a8a72fef9bc4a241f536ffbb50cdd1928215754