From: Philipp Zabel <philipp.zabel@gmail.com>
Date: Sat, 14 Jan 2006 18:31:36 +0000 (+0000)
Subject: merge of 0deeba4cb660a5020ac4c327942edd6b08498456
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=950748d385d97e52cab9e4cfbea74f62a5ebca3f;p=openembedded.git

merge of 0deeba4cb660a5020ac4c327942edd6b08498456
     and fba844d11d33af8cda04754102aa9c403bf71d1c
---

950748d385d97e52cab9e4cfbea74f62a5ebca3f