From: Justin Patrin <papercrane@gmail.com>
Date: Thu, 25 Aug 2005 17:21:51 +0000 (+0000)
Subject: merge of 2c7a585a04594ec0d49d170b8fd07f7eaaf33875
X-Git-Tag: Release-2010-05/1~9453^2~3779^2~15
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1eb9a965791e8a7524b3d317365e0f85260cd6ae;p=openembedded.git

merge of 2c7a585a04594ec0d49d170b8fd07f7eaaf33875
     and 509d6e16b96b95f3eee23c9d533dd87c708b8d4a
---

1eb9a965791e8a7524b3d317365e0f85260cd6ae