From: Rod Whitby <rod@whitby.id.au>
Date: Mon, 13 Nov 2006 10:21:44 +0000 (+0000)
Subject: merge of 'bb630da5015e0bccccc22590814ac62e46f845cc'
X-Git-Tag: Release-2010-05/1~9453^2~481^2^2~17
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9095ed6f813ceca2bce781247afa6b84055536c2;p=openembedded.git

Merge ... 'bb630da5015e0bccccc22590814ac62e46f845cc'
     and 'd2780d1e5f22684b8da55657b296c576b7d56930'
---

9095ed6f813ceca2bce781247afa6b84055536c2