From: Rod Whitby <rod@whitby.id.au>
Date: Wed, 1 Feb 2006 13:00:22 +0000 (+0000)
Subject: merge of 11d7aceb4fa662251d4850f8057e05439a0a1b10
X-Git-Tag: Release-2010-05/1~9453^2~2458^2~17^2~2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1f08c565b557892a5717af0d1283d97e9c4aa61c;p=openembedded.git

merge of 11d7aceb4fa662251d4850f8057e05439a0a1b10
     and e7435bb445f99b2a8a23053c5faf7ee2326e32d4
---

1f08c565b557892a5717af0d1283d97e9c4aa61c