From: Cliff Brake <cbrake@bec-systems.com>
Date: Mon, 13 Nov 2006 19:10:05 +0000 (+0000)
Subject: merge of '119a1b8e3787f193a0a34391450debc2878897c4'
X-Git-Tag: Release-2010-05/1~9453^2~523
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f7171587f09b13c97cc73109cd9eaf7c5aa78e47;p=openembedded.git

Merge ... '119a1b8e3787f193a0a34391450debc2878897c4'
     and '4f36e4b6e145cb3251f372bb7153308459b7ea41'
---

f7171587f09b13c97cc73109cd9eaf7c5aa78e47