From: Rod Whitby <rod@whitby.id.au>
Date: Wed, 23 Aug 2006 14:01:19 +0000 (+0000)
Subject: merge of 494ea06a4f82effd0cdf1130447f2e7a450002d8
X-Git-Tag: Release-2010-05/1~9453^2~878^2~2^2^2^2~2^2^2~1^2~1
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=fd25295d4367b8e353a21d5947601c67720d6d90;p=openembedded.git

merge of 494ea06a4f82effd0cdf1130447f2e7a450002d8
     and df180402f0f087c183887b23f644f25f1e4f3df6
---

fd25295d4367b8e353a21d5947601c67720d6d90