From: Philipp Zabel <philipp.zabel@gmail.com>
Date: Sat, 10 Jun 2006 15:24:52 +0000 (+0000)
Subject: merge of 222dc41b1f1c9b5ce83af7931aef248aadb739c1
X-Git-Tag: Release-2010-05/1~9453^2~1463^2~1^2~10
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1579edd1fd24a1afda9f8c5dbd1a4551a19424fb;p=openembedded.git

merge of 222dc41b1f1c9b5ce83af7931aef248aadb739c1
     and 67ed00b33157ce84b6e8ab9d09d8b8816e3e7b53
---

1579edd1fd24a1afda9f8c5dbd1a4551a19424fb