From: Michael Lauer <mickey@vanille-media.de>
Date: Thu, 6 Dec 2007 17:07:57 +0000 (+0000)
Subject: merge of '1a4ff139ec1bb8904ee0af6c1cc4b5737a4233cb'
X-Git-Tag: Release-2010-05/1~8202
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=288ecdbca2d898bc6aad1d617cee9d64a365567d;p=openembedded.git

Merge ... '1a4ff139ec1bb8904ee0af6c1cc4b5737a4233cb'
     and 'd025a5f00ad6ca971cacb9b19194efab7e1bee77'
---

288ecdbca2d898bc6aad1d617cee9d64a365567d