From: Rolf Leggewie <oe-devel@rolf.leggewie.biz>
Date: Sat, 23 Aug 2008 13:23:05 +0000 (+0000)
Subject: merge of '10e6bf1f992b208b919b4fc707871e1e1ae7e91e'
X-Git-Tag: Release-2010-05/1~6267
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=548b4dda4ac765a278976c9face5d815b0c0e732;p=openembedded.git

Merge ... '10e6bf1f992b208b919b4fc707871e1e1ae7e91e'
     and 'aeb148ecdb7be061e0dc9a58ffebbeca28f2e26d'
---

548b4dda4ac765a278976c9face5d815b0c0e732