From: Cliff Brake <cbrake@bec-systems.com>
Date: Mon, 3 Sep 2007 20:31:45 +0000 (+0000)
Subject: merge of 'a79e5ae3153847b525489dc6fd0b472b58bd3b17'
X-Git-Tag: Release-2010-05/1~8718^2~20^2~17
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3abe1cc404bdbad70ede822bedb7b6c1ffd80232;p=openembedded.git

Merge ... 'a79e5ae3153847b525489dc6fd0b472b58bd3b17'
     and 'fc1241826299a6a458edf92c52b4d95c0b785dfa'
---

3abe1cc404bdbad70ede822bedb7b6c1ffd80232