From: Michael Lauer <mickey@vanille-media.de>
Date: Sat, 14 Jun 2008 16:37:42 +0000 (+0000)
Subject: merge of '9ea31290125f045b9aba7f495e83482e68ce640d'
X-Git-Tag: Release-2010-05/1~6691^2~1
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1682d5f8e9ada57a3b1e3561c1c56e61a42514bd;p=openembedded.git

Merge ... '9ea31290125f045b9aba7f495e83482e68ce640d'
     and 'c06fa0c45cd1c86ad35d00394ce13105f5d01c08'
---

1682d5f8e9ada57a3b1e3561c1c56e61a42514bd