From: Philipp Zabel <philipp.zabel@gmail.com>
Date: Thu, 22 Sep 2005 14:08:21 +0000 (+0000)
Subject: merge of 42b169fabe3df723d70a1502561f5848f1287a98
X-Git-Tag: Release-2010-05/1~9453^2~3472
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=89dd14a2a673ab49867fa1e815a9238b9ea183eb;p=openembedded.git

merge of 42b169fabe3df723d70a1502561f5848f1287a98
     and a7038c05fef716879570b18652c839a87a2a65f8
---

89dd14a2a673ab49867fa1e815a9238b9ea183eb