From: Michael Lauer <mickey@vanille-media.de>
Date: Sun, 20 Jul 2008 13:18:34 +0000 (+0000)
Subject: merge of 'bd40bda8858164c7f6d35494b85fbc1df9474e4d'
X-Git-Tag: Release-2010-05/1~6518
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7c196f7439f45d4553120433ce14c6cfb1bbb283;p=openembedded.git

Merge ... 'bd40bda8858164c7f6d35494b85fbc1df9474e4d'
     and 'e73a25058e540cd7bb73833d96eb62b9a797b637'
---

7c196f7439f45d4553120433ce14c6cfb1bbb283