From: Michael Lauer <mickey@vanille-media.de>
Date: Sun, 13 Jan 2008 19:38:16 +0000 (+0000)
Subject: merge of '1680814672cc2662009b0e45fa9e20b4c5bc0968'
X-Git-Tag: Release-2010-05/1~7936
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b7ee6eac558fbca6f94cc056c61609c3ea194028;p=openembedded.git

Merge ... '1680814672cc2662009b0e45fa9e20b4c5bc0968'
     and '9b6e07a74ea0e9d244bc786420721f90d0ce1204'
---

b7ee6eac558fbca6f94cc056c61609c3ea194028