From: Rod Whitby <rod@whitby.id.au>
Date: Wed, 30 Aug 2006 11:46:07 +0000 (+0000)
Subject: merge of 6016fa0bf7402d89dcf3dc34a77bad5e750f2c11
X-Git-Tag: Release-2010-05/1~9453^2~876^2~12^2~1^2~1^2^2^2~1^2^2~1^2^2^2~1^2^2~1^2^2^2^2~5^2~1^2^2~1^2^2~2^2~1^2^2^2^2~1^2~2^2^2~1^2^2^2^2~1^2~2^2^2~1^2^2~3^2^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b534bb6c48006652b31d8e9a9589d2ed8bccf3ec;p=openembedded.git

merge of 6016fa0bf7402d89dcf3dc34a77bad5e750f2c11
     and 708df891f9f12bc072e9dea6f782a23aa35bbc9e
---

b534bb6c48006652b31d8e9a9589d2ed8bccf3ec