From: Philipp Zabel <philipp.zabel@gmail.com>
Date: Wed, 1 Mar 2006 18:28:10 +0000 (+0000)
Subject: merge of 6e871c66a3a79d4cb65e5784eace4cb7896df590
X-Git-Tag: Release-2010-05/1~9453^2~2304^2~12
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=288d131871a9b7e7857bfdb8556fd1a41f5259e8;p=openembedded.git

merge of 6e871c66a3a79d4cb65e5784eace4cb7896df590
     and f16c11d524e85958fbc2b3ec749e166ed4669741
---

288d131871a9b7e7857bfdb8556fd1a41f5259e8