From: Thomas Kunze <thommycheck@gmx.de>
Date: Sun, 2 Mar 2008 19:55:55 +0000 (+0000)
Subject: merge of '16882b53b725e8d7bfbf2d2909cfbf1f3a8a90fc'
X-Git-Tag: Release-2010-05/1~7572^2~15^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0e96be7f834f3264594c8e21b3fe5ee69c296486;p=openembedded.git

Merge ... '16882b53b725e8d7bfbf2d2909cfbf1f3a8a90fc'
     and '55956ba3628054539f1f1f6c44ab7108d48f8b32'
---

0e96be7f834f3264594c8e21b3fe5ee69c296486