From: Philipp Zabel <philipp.zabel@gmail.com>
Date: Wed, 1 Mar 2006 18:00:47 +0000 (+0000)
Subject: merge of 0abc64672fd7bfbde3b0d9aec834bbe1623570b1
X-Git-Tag: Release-2010-05/1~9453^2~2304^2~14
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=46698c5ce7137787023e838a0f1fd9a0ff214b17;p=openembedded.git

merge of 0abc64672fd7bfbde3b0d9aec834bbe1623570b1
     and 71d2eba1824aa4f45a3d63f7406148b84b342637
---

46698c5ce7137787023e838a0f1fd9a0ff214b17