From: Rod Whitby <rod@whitby.id.au>
Date: Fri, 18 Aug 2006 10:31:52 +0000 (+0000)
Subject: merge of 2375309a9ca5f8ab5d909f29faeaca5d1c2dd528
X-Git-Tag: Release-2010-05/1~9453^2~878^2~2^2^2^2~2^2^2~1^2~1^2^2~5^2^2^2~2^2^2~5^2^2~4^2^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3df5fd45b201668324f159616441c30fa4d8320a;p=openembedded.git

merge of 2375309a9ca5f8ab5d909f29faeaca5d1c2dd528
     and 5941ccc605ab8f526298799aa8921316e82809c4
---

3df5fd45b201668324f159616441c30fa4d8320a