From: Michael Lauer <mickey@vanille-media.de>
Date: Wed, 20 Feb 2008 17:12:37 +0000 (+0000)
Subject: merge of '1c2a066fe666a7ab871c0b647aa7557802e7960c'
X-Git-Tag: Release-2010-05/1~7648
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6836f43ea4f5dffc94d623c01cf3c39b56af8eef;p=openembedded.git

Merge ... '1c2a066fe666a7ab871c0b647aa7557802e7960c'
     and 'abff11b5d16c4babe2a2dc6adcf2fd393aea57d1'
---

6836f43ea4f5dffc94d623c01cf3c39b56af8eef