From: Philipp Zabel <philipp.zabel@gmail.com>
Date: Thu, 22 Sep 2005 21:34:06 +0000 (+0000)
Subject: merge of a60d3fd56109a66320e32c0f8aa0af61036586a2
X-Git-Tag: Release-2010-05/1~9453^2~3454
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1511edfb4338f3cb2e1082c00ee91a6d040453e3;p=openembedded.git

merge of a60d3fd56109a66320e32c0f8aa0af61036586a2
     and d08b1028598c89e26738182a8271ca038bd0f5b5
---

1511edfb4338f3cb2e1082c00ee91a6d040453e3