From: Koen Kooi <koen@openembedded.org>
Date: Sat, 23 Jul 2005 19:32:26 +0000 (+0000)
Subject: merge of 694e3e889df61d4f0755b908f187cc494887e701
X-Git-Tag: Release-2010-05/1~9453^2~4082
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9ad6142885c827a87dae653cf44fc8b8af54188d;p=openembedded.git

merge of 694e3e889df61d4f0755b908f187cc494887e701
     and 8b4259611fcc8bb40ab81877e66247b9f42bdb38
---

9ad6142885c827a87dae653cf44fc8b8af54188d