From: Robert Schuster <thebohemian@gmx.net>
Date: Thu, 26 Jun 2008 18:55:47 +0000 (+0000)
Subject: merge of '1b17ea5d09e29a9b9960e907c6a56908b349ff98'
X-Git-Tag: Release-2010-05/1~6618
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8dddf98f668c980faf09074ddc09a9355662655e;p=openembedded.git

Merge ... '1b17ea5d09e29a9b9960e907c6a56908b349ff98'
     and '60512e4106703c7bf44fad424ce575f2496d82a9'
---

8dddf98f668c980faf09074ddc09a9355662655e