From: Rod Whitby <rod@whitby.id.au>
Date: Sun, 21 May 2006 01:41:12 +0000 (+0000)
Subject: merge of 7ec369fda75af141429df5f12e02b43d815f6515
X-Git-Tag: Release-2010-05/1~9453^2~1580^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b4aade330e5191ba9a0a28c37e04da4ddb6148a4;p=openembedded.git

merge of 7ec369fda75af141429df5f12e02b43d815f6515
     and abf00cce624bf75483d805556b1219a4bb3638c5
---

b4aade330e5191ba9a0a28c37e04da4ddb6148a4