From: Rod Whitby <rod@whitby.id.au>
Date: Thu, 12 Oct 2006 18:01:44 +0000 (+0000)
Subject: merge of 9bb3000ad8f3fb750b0dca5ff1bdb2e227c9a5d4
X-Git-Tag: Release-2010-05/1~9453^2~567^2~212^2~11
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f33a869155cb7dd8e5978cc27598899a73d3160a;p=openembedded.git

merge of 9bb3000ad8f3fb750b0dca5ff1bdb2e227c9a5d4
     and c6fb093b38ea7c9bbd991dd6de48fa42add04e55
---

f33a869155cb7dd8e5978cc27598899a73d3160a