From: Rod Whitby <rod@whitby.id.au>
Date: Sat, 7 Jul 2007 11:52:02 +0000 (+0000)
Subject: merge of '050cc7da614b31484f65138eb5faa6715af3fc5c'
X-Git-Tag: Release-2010-05/1~8868^2~189^2~3^2~29^2~1
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6aa433ab8423974a6c2f3fa531a13c656eaeadec;p=openembedded.git

Merge ... '050cc7da614b31484f65138eb5faa6715af3fc5c'
     and 'f3312a5f747d70b34f246bcf7563edf94614d025'
---

6aa433ab8423974a6c2f3fa531a13c656eaeadec