From: Michael Lauer <mickey@vanille-media.de>
Date: Sun, 22 Jun 2008 11:57:04 +0000 (+0000)
Subject: merge of 'ef57d7f9782540c734ca9342f8a136c7bbeb5074'
X-Git-Tag: Release-2010-05/1~6650
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f5f80119bd3754a7a9c5b208db11f42e020cb263;p=openembedded.git

Merge ... 'ef57d7f9782540c734ca9342f8a136c7bbeb5074'
     and 'fcaa336068b9697eb2e8236103ae4865056796c1'
---

f5f80119bd3754a7a9c5b208db11f42e020cb263