From: Cliff Brake <cbrake@bec-systems.com>
Date: Thu, 25 Oct 2007 02:58:27 +0000 (+0000)
Subject: merge of 'eb36ea3d0bc0c86631fe499a8eff4d72e96e9e86'
X-Git-Tag: Release-2010-05/1~8454^2~142
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6c548afdbea5268eead369b6f94e2c82ccd69c0a;p=openembedded.git

Merge ... 'eb36ea3d0bc0c86631fe499a8eff4d72e96e9e86'
     and 'f404eeaff12f4a005212507219029f6899cf3bee'
---

6c548afdbea5268eead369b6f94e2c82ccd69c0a