From: Rod Whitby <rod@whitby.id.au>
Date: Tue, 11 Apr 2006 06:34:00 +0000 (+0000)
Subject: merge of a9390448d82c08088c9697046e14075f0c439840
X-Git-Tag: Release-2010-05/1~9453^2~2045^2~1^2~1
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4841b201810b9b6dff9ecbafdfd766a925a6c1eb;p=openembedded.git

merge of a9390448d82c08088c9697046e14075f0c439840
     and d93900aa884b52d778b478749eeafadb6bef3a21
---

4841b201810b9b6dff9ecbafdfd766a925a6c1eb