From: Rod Whitby <rod@whitby.id.au>
Date: Sat, 30 Jul 2005 05:58:17 +0000 (+0000)
Subject: merge of 34d7d13995f4c7df9dfc8e24039e1a28cb5a5067
X-Git-Tag: Release-2010-05/1~9453^2~2960^2^2~9^2~2^2~3^2^2~4^2~75
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=cc908328fdeb08549c610a8f8e9131737bd3fc89;p=openembedded.git

merge of 34d7d13995f4c7df9dfc8e24039e1a28cb5a5067
     and 585b80ad8a88b38eb27464e650e27f5a0344b491
---

cc908328fdeb08549c610a8f8e9131737bd3fc89