From: Philipp Zabel <philipp.zabel@gmail.com>
Date: Thu, 16 Mar 2006 16:04:55 +0000 (+0000)
Subject: merge of 39d6becf1562e4912199977590a3a075431287ac
X-Git-Tag: Release-2010-05/1~9453^2~2232^2~8
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5d356c3166a7958a92e937c79ba25e688a287ca0;p=openembedded.git

merge of 39d6becf1562e4912199977590a3a075431287ac
     and 891ff1a9417a644b5b3fc9a96299e4ba2a0ca442
---

5d356c3166a7958a92e937c79ba25e688a287ca0