From: Rod Whitby <rod@whitby.id.au>
Date: Fri, 1 Dec 2006 02:36:34 +0000 (+0000)
Subject: merge of '458572360c2648ede27e8221a9f03f0a6348890d'
X-Git-Tag: Release-2010-05/1~9453^2~204^2~64^2~2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a30e8e26acbdca71400ab76d3d49585393c8dfc8;p=openembedded.git

Merge ... '458572360c2648ede27e8221a9f03f0a6348890d'
     and '87e65172326e1004bccdaaced91bbeb24edf069f'
---

a30e8e26acbdca71400ab76d3d49585393c8dfc8