From: Cliff Brake <cbrake@bec-systems.com>
Date: Thu, 19 Oct 2006 20:09:55 +0000 (+0000)
Subject: merge of '345e8a8f2ff4e1eb4b806053856f075bf111a801'
X-Git-Tag: Release-2010-05/1~9453^2~567^2~83^2~2^2~1
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6121b2825de7fafc1224aee5fb8192f3dac89458;p=openembedded.git

Merge ... '345e8a8f2ff4e1eb4b806053856f075bf111a801'
     and 'b1cace7bd8dc05cf34a5ca296aae672c7c4cbcd2'
---

6121b2825de7fafc1224aee5fb8192f3dac89458