From: Michael Lauer <mickey@vanille-media.de>
Date: Fri, 20 Oct 2006 11:55:16 +0000 (+0000)
Subject: merge of '296ff29bfd956e25378dc4b3d757bfe71b1010d5'
X-Git-Tag: Release-2010-05/1~9453^2~567^2~83
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0f03543eb2a001204993d7c22920feda3748fb31;p=openembedded.git

Merge ... '296ff29bfd956e25378dc4b3d757bfe71b1010d5'
     and '9a74dad27351d4893343978ef329c84a1fc7dbfb'
---

0f03543eb2a001204993d7c22920feda3748fb31