From: Michael Lauer <mickey@vanille-media.de>
Date: Tue, 31 Jul 2007 23:47:30 +0000 (+0000)
Subject: merge of '2ee5368f3cc4e859f6bec4ecffc2dbc9385fa3d7'
X-Git-Tag: Release-2010-05/1~8868^2~62^2~27^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=997ce347575f7c5f7d19290fd6a84cf8d536c04a;p=openembedded.git

Merge ... '2ee5368f3cc4e859f6bec4ecffc2dbc9385fa3d7'
     and '62b5fc0f9207b54a854b0ea813248e4ab12bdb81'
---

997ce347575f7c5f7d19290fd6a84cf8d536c04a