From: Rod Whitby <rod@whitby.id.au>
Date: Sun, 10 Feb 2008 06:21:05 +0000 (+0000)
Subject: merge of '2db4e9cef88c3ec05f6df40ed5af176f05ff53f2'
X-Git-Tag: Release-2010-05/1~7696^2~11^2~5
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2ddbbc2204c01d6db5dd0d5e396ea8dc098d4a03;p=openembedded.git

Merge ... '2db4e9cef88c3ec05f6df40ed5af176f05ff53f2'
     and 'ff65599591bcdfa3d446b1ea051a1d78970b2a0e'
---

2ddbbc2204c01d6db5dd0d5e396ea8dc098d4a03