From: Michael Lauer <mickey@vanille-media.de>
Date: Sun, 3 Aug 2008 13:04:56 +0000 (+0000)
Subject: merge of '1fc0d39fdc86680d51d6fec00f6cc3ba43d300f3'
X-Git-Tag: Release-2010-05/1~6375^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7461c2a07f46bcbd299ca5cb4ed1c101c64a4294;p=openembedded.git

Merge ... '1fc0d39fdc86680d51d6fec00f6cc3ba43d300f3'
     and '23cc848ee4d3462f245c833eadb2b673eb6ab921'
---

7461c2a07f46bcbd299ca5cb4ed1c101c64a4294