From: Rod Whitby <rod@whitby.id.au>
Date: Wed, 15 Nov 2006 07:20:03 +0000 (+0000)
Subject: merge of 'ae579c1f35512dfab367e798299148581e0c7b11'
X-Git-Tag: Release-2010-05/1~9453^2~490^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c1a7b8ddc811d94cfe2d14331feae0f6ee92e892;p=openembedded.git

Merge ... 'ae579c1f35512dfab367e798299148581e0c7b11'
     and 'bcb6ebdf4f4051fe2953e3f6319bdf6ef5e111a9'
---

c1a7b8ddc811d94cfe2d14331feae0f6ee92e892