From: Rod Whitby <rod@whitby.id.au>
Date: Sun, 20 May 2007 13:13:23 +0000 (+0000)
Subject: merge of '69c4f0caa0e5f093ca29b5c0346241936d777f83'
X-Git-Tag: Release-2010-05/1~8868^2~422
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=eca86906b0d6cd56748cb77fae0c0a2fc5577532;p=openembedded.git

Merge ... '69c4f0caa0e5f093ca29b5c0346241936d777f83'
     and '8f7fdc42175bc408f61d4e4b98b0def52196fd3b'
---

eca86906b0d6cd56748cb77fae0c0a2fc5577532