From: Rod Whitby <rod@whitby.id.au>
Date: Sat, 31 Mar 2007 04:20:04 +0000 (+0000)
Subject: merge of 'ae26bb4112e051d66021f351f55f22b6040a7cea'
X-Git-Tag: Release-2010-05/1~8868^2~871^2~5
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e9f65c13e161ebc2e51b20a65cefb2c741c4da92;p=openembedded.git

Merge ... 'ae26bb4112e051d66021f351f55f22b6040a7cea'
     and 'cd22877f4e17c69ac2ad67cf31f355652a11d86c'
---

e9f65c13e161ebc2e51b20a65cefb2c741c4da92